xxxxx

GuangZuan/miniprogram/app.json

@@ -59,7 +59,8 @@
         "pages/purchase/list/index",
         "pages/purchase/detail/index",
         "pages/purchase/new/index",
-        "pages/settle/list/index"
+        "pages/settle/list/index",
+        "pages/members/index"
       ]
     },
     {

GuangZuan/miniprogram/components/nav-bar/nav-bar.wxml

@@ -1,4 +1,4 @@
-<van-nav-bar custom-style="background-color: {{ bgColor }}">
+<van-nav-bar custom-style="background-color: {{ bgColor }}" >
   <van-icon wx:if="{{ left }}" slot="left" name="arrow-left" size="25px" color="#333"/>
   <text slot="title" style="color: {{ titleColor }};">{{ title }}</text>
 </van-nav-bar>

GuangZuan/miniprogram/mHome/pages/bond/detail/index.less

@@ -4,9 +4,9 @@
   z-index: 999;
 
   .title-view {
-    margin: 10px;
+    margin: 5px;
     background-color: #f0f0f0;
-    height: 70px;
+    height: 60px;
     border-radius: 10px;
     display: flex;
     align-items: center;
@@ -48,7 +48,7 @@
 }
 
 .item-view {
-  margin: 10px;
+  margin: 5px;
   border-radius: 10px;
   display: flex;
   align-items: center;

GuangZuan/miniprogram/mHome/pages/bond/detail/index.wxml

@@ -8,8 +8,8 @@
 
   <!-- 单据信息 --> 
   <view class="order-info">
-    <text class="order-info--orderno">单据信息：{{ order.orderid }}</text>
-    <text class="order-info--status">{{ order.gzbsstatusdisplay }}</text>
+    <text class="order-info--orderno">【单据信息】{{ orderid }}</text>
+    <text class="order-info--status">{{ status }}</text>
   </view>
 
   <!-- 列头 --> 

GuangZuan/miniprogram/mHome/pages/goodsdetail/index.ts

@@ -3,7 +3,7 @@ import { EOrderSrc } from "../../../constants/enum/index"
 import services from "../../../services/index"
 import { sendMsgToMQ } from "../../../services/api/common/index"
 import { getGoods, queryPermancePlanTmp } from "../../../services/api/orders/index"
-import { accountid, clientType, getErrorMsg, isEncrypted, loginid, marketid, protoHeader, timetample, userid, loginQuery } from "../../../services/utils"
+import { accountid, clientType, getErrorMsg, isEncrypted, loginid, marketid, protoHeader, timetample, userid, loginQuery, isMyFavorite } from "../../../services/utils"
 import { hideLoading, showLoading, showModel, showToast } from "../../../utils/message/index"
 import { encryptBody } from "../../../utils/websocket/crypto"
 import { isnullstr } from "../../../utils/util"
@@ -210,7 +210,7 @@ Page({
    */
   onLoad(options: any) {
     /// 商品编号
-    this.setData({ goodsno: options.goodsno, ordertime: options.ordertime })
+    this.setData({ goodsno: options.goodsno, ordertime: options.ordertime, operator: isMyFavorite(options.goodsno) ? 1 : 2 })
     /// 获取商品数据
     this.getGoods()
     /// 单据信息

GuangZuan/miniprogram/mHome/pages/inspection/detail/index.less

@@ -65,7 +65,7 @@
   }
 
   .title-view {
-    margin: 10px;
+    margin: 5px;
     background-color: #f0f0f0;
     height: 70px;
     border-radius: 10px;
@@ -94,12 +94,6 @@
       border-bottom: 1px solid #ddd;
     }
   }
-
-  .ordertitle {
-    color: #333;
-    font-size: 16px;
-    font-weight: bold;
-  }
 }
 
 .item-view {
@@ -147,4 +141,10 @@
     border-bottom: 1px solid #ddd;
     padding-bottom: 5px;
   }
+}
+
+.ordertitle {
+  color: #333;
+  font-size: 18px;
+  font-weight: bold;
 }

GuangZuan/miniprogram/mHome/pages/inspection/detail/index.wxml

@@ -8,8 +8,8 @@
 
   <!-- 单据信息 -->
   <view class="orderinfo">
-    <view class="title_item">
-      <text class="ordertitle">【单据信息】</text>
+    <view class="title_item" style="margin-left: -10px;">
+      <text class="ordertitle" style="font-size: 18px;">【单据信息】</text>
       <text>{{ order.orderid }}</text>
       <text>{{ order.gzcjstatusdisplay }}</text>
     </view>

GuangZuan/miniprogram/mHome/pages/members/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

GuangZuan/miniprogram/mHome/pages/members/index.less

@@ -0,0 +1,80 @@
+.container {
+  .memberinfo {
+    display: flex;
+    flex-direction: column;
+
+    &__list {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      align-content: center;
+      align-items: center;
+  
+      &__item {
+        display: flex;
+        flex-direction: row;
+        align-content: center;
+        align-items: center;
+        justify-content: space-around;
+        width: 95%;
+        border-bottom: 1px solid #f0f0f0;
+        padding: 10px 0px;
+  
+        &__right {
+          display: flex;
+          flex-direction: column;
+          width: 100%;
+          align-content: center;
+          align-items: center;
+          margin-left: 10px;
+          height: 100%;
+  
+          &__top, &__btm {
+            height: 35px;
+          }
+  
+          &__top, &__mid {
+            display: flex;
+            flex-direction: row;
+            justify-content: start;
+            align-items: center;
+            width: 100%;
+  
+            .goodsname, .username {
+              color: #000000;
+              font-size: 15px;
+              margin-right: 10px;
+              font-weight: bold;
+            } 
+  
+            .tag {
+              background-color: #407DB8;
+              padding: 2.5px 10px;
+              border-radius: 10px;
+              color: #fff;
+              font-size: 11px;
+              margin-right: 5px;
+            }
+          }
+  
+          &__mid {
+            height: 100%;
+          }
+  
+          &__btm {
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            align-items: center;
+            width: 100%;
+  
+            .mobile, .wechat {
+              font-size: 13px;
+              color: #000;
+            }
+          }
+        }
+      }
+    }
+  }
+}

GuangZuan/miniprogram/mHome/pages/members/index.ts

@@ -0,0 +1,119 @@
+import services from "../../../services/index"
+import { getGZMemberInfo } from "../../../services/api/common/index"
+import { hideLoading, showLoading } from "../../../utils/message/index"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 底部安全区域
+    safeBottom: getApp().globalData.safeBottom,
+    /// 会员信息
+    members: <GuangZuan.GZMemberInfo[]>[],
+    /// 是否为空
+    isEmpty: true
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+   /**
+   * 获取会员风采表
+   */
+  queryGZMemberInfo(){
+    /// loading
+    showLoading(()=>{
+      /// 发送查询请求
+      getGZMemberInfo({
+        success:(res) => {
+          /// 数据为空
+          if (res.code != 200) {
+            hideLoading(()=>{}, '会员信息请求失败，原因：'+res.msg)
+            return
+          }
+          hideLoading(()=>{
+            /// 加载成功 数据复制
+            this.setData({ 
+              members: res.data.map(itm => {
+                var obj = itm
+                obj.imageurl = (services.config.openApiUrl+itm.imageurl).replace('./uploadFile', '/uploadFile')
+                obj.membertagsdisplay = itm.membertags.split(',')
+                return obj
+              }),
+              isEmpty: res.data.length === 0
+            })
+          })
+        },
+        fail: (emsg) => {
+          /// 加载失败
+          hideLoading(()=>{}, emsg)
+        }
+      })
+    })
+  },
+
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    /// 获取会员风采表
+    this.queryGZMemberInfo()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mHome/pages/members/index.wxml

@@ -0,0 +1,35 @@
+<view class="container" style="padding-bottom: {{ safeBottom+44.0+10.0 }}px;" >
+  <!-- 导航栏 -->
+  <van-nav-bar custom-style="background-color: #407DB8">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#fff" bind:click="backToParent"/>
+    <text slot="title" style="color: #fff;">会员风采</text>
+  </van-nav-bar>
+
+  <!-- 会员风采 -->
+  <view class="memberinfo" style="background-color: white;">
+    <view class="memberinfo__list">
+      <view class="memberinfo__list__item" wx:for="{{ members }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">
+        <van-image width="70" height="70" radius="10" fit="cover" use-loading-slot src="{{ itm.imageurl }}" />
+        <view class="memberinfo__list__item__right">
+          <view class="memberinfo__list__item__right__top">
+            <text class="goodsname">{{ itm.membername }}</text>
+            <text class="username">{{ itm.contactname }}</text>
+          </view>
+          <view class="memberinfo__list__item__right__mid">
+            <text class="tag" wx:for="{{ itm.membertagsdisplay }}" wx:for-item="tag" wx:for-index="idx" wx:key="idx">{{ tag }}</text>
+          </view>
+          <view class="memberinfo__list__item__right__btm">
+            <text class="mobile" user-select>电话: {{ itm.contactphone }}</text>
+            <text class="wechat" user-select>微信: {{ itm.contactwx }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+   <!-- 无数据 --> 
+   <van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
+</view>
+
+<!-- toast --> 
+<van-toast id="van-toast" />

GuangZuan/miniprogram/mMine/pages/myperformance/detail/index.less

@@ -1,9 +1,5 @@
 .container {
   width: 100%;
-  display: flex;
-  flex-direction: column;
-  align-content: center;
-  align-items: center;
 
   .topView {
     position: sticky;
@@ -83,13 +79,14 @@
   }
 
   .perform-detail-info {
-    width: 90%;
     background-color: #f0f0f0;
     padding: 10px;
     display: flex;
     flex-direction: column;
     align-content: center;
     border-radius: 10px;
+    align-items: center;
+    margin: 0px 10px;
 
     .item {
       width: 100%;
@@ -117,11 +114,11 @@
     align-items: center;
     align-content: center;
     border: 1px solid #387BDC;
-    width: 90%;
     border-radius: 10px;
     margin: 5px 0px;
     color: #333;
     font-size: 14px;
+    margin: 5px 10px;
 
     &__up, &__mid, &__dwn {
       width: 100%;

GuangZuan/miniprogram/mMine/pages/myperformance/detail/index.ts

@@ -13,6 +13,8 @@ Page({
    * 页面的初始数据
    */
   data: {
+    /// 底部安全区域
+    safeBottom: getApp().globalData.safeBottom,
     /// 列头
     titles: [['重量 | 形状 | 款式 | 尺寸', ' 编号'], 
              ['颜色 | 净度 | 对称 | 抛光 | 荧光 | 证书', '价格']],

GuangZuan/miniprogram/mMine/pages/myperformance/detail/index.wxml

@@ -1,4 +1,4 @@
-<view class="container">
+<view class="container" style="padding-bottom: {{ safeBottom }}px;">
   <view class="topView">
     <!-- 导航栏 -->
     <van-nav-bar custom-style="background-color: #407DB8">

GuangZuan/miniprogram/pages/circle/index.ts

@@ -1,6 +1,6 @@
 import { queryMyFavorite } from "../../services/api/orders/index"
 import Toast from "../../miniprogram_npm/@vant/weapp/toast/toast"
-import { clientType, isEncrypted, marketid, protoHeader, userid, timetample, getErrorMsg } from "../../services/utils";
+import { clientType, isEncrypted, marketid, protoHeader, userid, timetample, getErrorMsg, saveMyFavorites } from "../../services/utils";
 import { sendMsgToMQ } from "../../services/api/common/index";
 import { FunCode } from "../../constants/enum/funcode";
 import { isnullstr } from "../../utils/util";
@@ -149,6 +149,9 @@ Page({
             hideLoading(()=>{}, '请求失败，原因：'+res.msg)
             return
           }
+          /// 保存我的收藏
+          // saveMyFavorites(res.data)
+          /// hideLoading
           hideLoading(()=>{
             /// 数据赋值
             this.setData({ 

GuangZuan/miniprogram/pages/circle/index.wxml

@@ -22,7 +22,7 @@
 </view>
 
 <!-- 内容滚动视图 --> 
-<scroll-view class="content-view" style="background-color: #f0f0f0;">
+<scroll-view class="content-view" style="background-color: #f0f0f0;" wx:if="{{ !isEmpty }}"> 
   <!-- 出售大厅数据 --> 
   <van-swipe-cell wx:for="{{ values }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" id="{{ idx }}" right-width="{{ width }}" bind:click="onSelectItem">
     <view class="item-view {{ favorites[idx].isChecked ? 'active' : ''}}">

GuangZuan/miniprogram/pages/home/index.ts

@@ -1,7 +1,7 @@
 import services from "../../services/index"
 import { queryImageConfigs, queryNotice, getGZMemberInfo } from "../../services/api/common/index"
-import { homeData } from "../../services/api/orders/index"
-import { loginid, loginQuery, userid } from "../../services/utils"
+import { homeData, queryMyFavorite } from "../../services/api/orders/index"
+import { loginid, loginQuery, saveMyFavorites, saveTradeActive, userid } from "../../services/utils"
 import { hideLoading, showLoading } from "../../utils/message/index"
 import { appConfig } from "../../config/index"
 
@@ -30,13 +30,13 @@ Page({
             {id: 9,  icon: 'home-jsq',   title: '钻石计算器', path: '/mHome/pages/calculator/index'}, 
             {id: 10,  icon: 'home-zscx',  title: '证书查询',   path: '/mHome/pages/cerserach/index'}],
     /// 统计
-    statistics: { top: [{id: 1, title: '出售中', value: 0, class: ''}], rate: '' },
+    statistics: { top: [{id: 0, title: '', value: 0, class: ''}], rate: '' },
     /// tabs
     tabs: [{id: 1, title: '公告'}, {id: 2, title: '消息'}],
     /// 公告消息
-    notice: {},
+    notice: <GuangZuan.Notice>{},
     /// 公告消息
-    msgs: [{}],
+    msgs: <GuangZuan.Notice[]>[],
     /// 会员信息
     members: <GuangZuan.GZMemberInfo[]>[],
     /// 是否为空
@@ -92,11 +92,11 @@ Page({
     switch (e.currentTarget.id) {
       case "transactionssold":       /// 出售中
         wx.switchTab({ url: '/pages/trade/index' })
-        wx.setStorageSync('trade_active', 0)
+        saveTradeActive(0)
         break;
       case "transactioninpurchase":  /// 求购中
         wx.switchTab({ url: '/pages/trade/index' })
-        wx.setStorageSync('trade_active', 1)
+        saveTradeActive(1)
         break;
       case "purchasedtransactions":  /// 已购买
         wx.navigateTo({ url: '/mMine/pages/myperformance/list/index?active=0' })
@@ -144,6 +144,20 @@ Page({
     })
   },
 
+   /// 查询我的收藏
+  queryMyFavorites() {
+    // 查询我的收藏
+    queryMyFavorite({
+      data: {
+        userid: userid()
+      },
+      success: (res) => {
+        /// 保存我的收藏
+        saveMyFavorites(res.data)
+      }
+    })
+  },
+
    /**
    * 获取会员风采表
    */
@@ -188,6 +202,12 @@ Page({
     })
   },
 
+  goToMemberInfo() {
+    wx.navigateTo({
+      url: '/mHome/pages/members/index'
+    })
+  },
+
   /// 进入公告消息详情页
   goToMsgDetail(r: any) {
     let jsonStr = JSON.stringify(this.data.msgs[r.currentTarget.id])
@@ -206,6 +226,8 @@ Page({
     this.queryImageConfigs()
     /// 查询会员信息
     this.queryGZMemberInfo()
+    /// 查询我的收藏
+    this.queryMyFavorites()
   },
 
   /**

GuangZuan/miniprogram/pages/home/index.wxml

@@ -35,7 +35,7 @@
 
   <view style="background-color: #fff;">
     <!-- 功能菜单 -->
-    <van-grid column-num="5" border="{{ false }}" icon-size="{{ 35 }}">
+    <van-grid column-num="5" border="{{ false }}" clickable="{{ true }}" icon-size="{{ 35 }}">
       <van-grid-item content-class ="van-grid-item" wx:for="{{ menus }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" url="{{ itm.path }}" text="{{ itm.title }}" icon="{{ imgUrl+itm.icon }}.png" link-type="{{ itm.id === 1 ? 'switchTab' : 'navigateTo' }}"/>
     </van-grid>
   </view>
@@ -51,7 +51,7 @@
   <view class="memberinfo" style="background-color: white;">
     <view class="memberinfo__top">
       <text class="title">会员风采</text>
-      <text class="more">更多 >></text>
+      <text class="more" bindtap="goToMemberInfo">更多 >></text>
     </view>
     <view class="memberinfo__list">
       <view class="memberinfo__list__item" wx:for="{{ members }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">

GuangZuan/miniprogram/pages/login/index.ts

@@ -1,6 +1,6 @@
 import { login, loginQuery } from '../../services/api/account/index'
 import { appConfig } from '../../config/index'
-import { getDivisions, getLoginCode, loginid, setAllEnums, setAllErrors, setLoginCode, taAccounts } from '../../services/utils'
+import { getDivisions, getLoginCode, loginid, saveAuthorization, saveLoginID, saveLoginQuery, saveMarketID, saveTradeActive, saveUserId, setAllEnums, setAllErrors, setLoginCode, taAccounts } from '../../services/utils'
 import { getAllEnums, queryErrorInfos } from '../../services/api/common/index'
 import { hideLoading, showLoading, showToast } from '../../utils/message/index'
 import { encryptBody } from '../../utils/websocket/crypto'
@@ -73,9 +73,9 @@ Page({
             /// 设置登录账号
             setLoginCode(this.data.username)
             /// 存储token以及loginId、userId
-            wx.setStorageSync('Authorization', res.data.token)
-            wx.setStorageSync('LoginID', res.data.loginId)
-            wx.setStorageSync('UserId', res.data.userId)
+            saveAuthorization(res.data.token)
+            saveLoginID(res.data.loginId)
+            saveUserId(res.data.userId)
 
             /// 获取地区区域信息
             getDivisions()
@@ -102,11 +102,11 @@ Page({
         data: { loginID: loginid() },
         success: (res) => {
           /// 数据存储
-          wx.setStorageSync('LoginQuery', res.data)
+          saveLoginQuery(res.data)
           /// 默认挂牌大厅为出售
-          wx.setStorageSync('trade_active', 0)
+          saveTradeActive(0)
           /// 存储市场ID
-          wx.setStorageSync('MarketID', res.data.markets[0].marketid)
+          saveMarketID(res.data.markets[0].marketid)
           /// 获取所有的枚举值
           this.getAllEnums()
           /// 获取所有的错误码

GuangZuan/miniprogram/pages/mine/index.ts

@@ -1,7 +1,7 @@
 import { appConfig } from '../../config/index';
 import Dialog from  '../../miniprogram_npm/@vant/weapp/dialog/dialog'
 import { queryBankAccountSign } from '../../services/api/account/index';
-import { accountid, getLoginCode, loginid, loginQuery, setLoginCode, taAccount, userid } from '../../services/utils';
+import { accountid, getAvatarUrl, getLoginCode, loginid, loginQuery, setLoginCode, taAccount, userid } from '../../services/utils';
 import { hideLoading, showLoading, showToast } from '../../utils/message/index';
 
 Page({
@@ -26,7 +26,7 @@ Page({
                  {id: 4, title: '账户安全', iconfont: 'mine-mmxg', path: '/mMine/pages/modifypwd/index'}, 
                  {id: 5, title: '关于我们', iconfont: 'mine-gywm', path: '/mMine/pages/about/about/index'}],
     /// 微信头像 
-    avatarUrl: wx.getStorageSync('avatarUrl'),
+    avatarUrl: getAvatarUrl(),
     /// 微信昵称
     nickName: '',
     /// 资金账户信息

GuangZuan/miniprogram/pages/mine/index.wxml

@@ -39,7 +39,7 @@
   </view>
 
   <!-- 功能菜单项 -->
-  <van-grid column-num="5" border="{{ false }}" wx:if="{{ menulists.count != 0 }}">
+  <van-grid column-num="5" border="{{ false }}" clickable="{{ true }}" wx:if="{{ menulists.count != 0 }}">
     <van-grid-item wx:for="{{ menulists }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" link-type="navigateTo" url="{{ itm.path }}">
       <van-image slot="icon" width="25" height="25" fit="cover" lazy-load src="{{ imgUrl+itm.img }}.png" />
       <text slot="text" style="font-size: 14px;">{{ itm.title }}</text>

GuangZuan/miniprogram/pages/trade/index.ts

@@ -1,5 +1,5 @@
 import { queryBuyOrder, queryDiamond } from "../../services/api/orders/index"
-import { clientType, isEncrypted, marketid, protoHeader, userid, timetample, getEnumList, getErrorMsg } from "../../services/utils";
+import { clientType, isEncrypted, marketid, protoHeader, userid, timetample, getEnumList, getErrorMsg, isMyFavorite } from "../../services/utils";
 import { FunCode } from "../../constants/enum/funcode";
 import { sendMsgToMQ } from "../../services/api/common/index";
 import { hideLoading, showLoading } from "../../utils/message/index";
@@ -141,7 +141,7 @@ Page({
       /// 参数信息
       const info = JSON.stringify({ 
         UserID: userid(),
-        OperateType: 1,
+        OperateType: this.data.sellOrders[index].favorite ? 2 : 1,
         ClientType: clientType(),
         MarketID: marketid(),
         ClientSerialNo: timetample().toString(),
@@ -232,6 +232,7 @@ Page({
                 obj.zspolishtype1display = isnullstr(itm.zspolishtype1display)
                 obj.zsfluorescencetype1display = isnullstr(itm.zsfluorescencetype1display)
                 obj.zssymmetrytype1display = isnullstr(itm.zssymmetrytype1display)
+                obj.favorite = isMyFavorite(obj.goodsno)
                 return obj
               }) 
             })
@@ -333,6 +334,8 @@ Page({
         }
       })),
     })
+    /// 查询数据
+    this.data.active == 0 ? this.queryDiamond() : this.queryBuyOrder()
   },
 
   onShow() {

GuangZuan/miniprogram/pages/trade/index.wxml

@@ -34,7 +34,7 @@
 </view>
 
 <!-- 内容滚动视图 --> 
-<scroll-view wx:if="{{ active === 0 ? sellOrders.length != 0 : askOrders.length != 0 }}" class="content-view" style="padding-bottom: {{ sellOrders.length > 3 ? safeBottom+navHeight+15 : 15 }}px;">
+<scroll-view wx:if="{{ !isEmpty }}" class="content-view" style="padding-bottom: {{ sellOrders.length > 3 ? safeBottom+navHeight+15 : 15 }}px;">
   <!-- 数据 --> 
   <van-swipe-cell wx:for="{{ active === 0 ? sellOrders : askOrders }}" wx:for-item="itm" wx:for-index="idx" wx:key="wrtradeorderid" id="detail {{ idx }}" right-width="50" >
     <view class="vanSwipeCell-item">
@@ -58,7 +58,7 @@
         </view>
         <view class="vanSwipeCell-item__mid__right" id="favorite {{ idx }}" wx:if="{{ active === 0 }}" bindtap="onButtonPressed">
           <van-icon name="star" id="favorite {{ idx }}" color="#407DB8" bind:click="onButtonPressed" />
-          <text id="favorite {{ idx }}" bindtap="onButtonPressed">已收藏</text>
+          <text id="favorite {{ idx }}" bindtap="onButtonPressed">{{ itm.favorite ? '已收藏' : '去收藏' }}</text>
         </view>
         <view class="vanSwipeCell-item__mid__right" id="delisting {{ idx }}" wx:if="{{ active === 1 }}" bindtap="onButtonPressed">
           <van-icon id="delisting {{ idx }}" name="fire-o" color="#407DB8" bind:click="onButtonPressed" />

GuangZuan/miniprogram/services/utils.ts

@@ -286,4 +286,61 @@ export function setLoginCode(code: string) {
 
 export function getLoginCode(): string {
   return wx.getStorageSync('loginCode')
+}
+
+/// 设置我的收藏
+export function saveMyFavorites(data: GuangZuan.MyFavorite[]) {
+  wx.setStorageSync('Favorites', data)
+}
+
+/// 获取我的收藏
+export function getMyFavorites(): GuangZuan.MyFavorite[] {
+  return <GuangZuan.MyFavorite[]>wx.getStorageSync('Favorites')
+}
+
+/// 判断是否为我的收藏
+export function isMyFavorite(goodsno: string): boolean {
+  const objs = getMyFavorites()
+  return objs.some(obj => { return obj.goodsno === goodsno })
+}
+
+/// 登录查询
+export function saveLoginQuery(data: GuangZuan.LoginQuery) {
+  /// 数据存储
+  wx.setStorageSync('LoginQuery', data)
+}
+
+/// 存储市场ID
+export function saveMarketID(id: number) {
+   wx.setStorageSync('MarketID', id)
+}
+
+/// 默认挂牌大厅为出售
+export function saveTradeActive(active: number) {
+  wx.setStorageSync('trade_active', active)
+}
+
+/// 存储token
+export function saveAuthorization(token: string) {
+  wx.setStorageSync('Authorization', token)
+}
+
+/// 存储LoginID
+export function saveLoginID(loginId: number) {
+  wx.setStorageSync('LoginID', loginId)
+}
+
+/// 存储UserId
+export function saveUserId(userId: number) {
+  wx.setStorageSync('UserId', userId)
+}
+
+/// 存储微信头像
+export function saveAvatarUrl(avatarUrl: string) {
+  wx.setStorageSync('avatarUrl', avatarUrl)
+}
+
+/// 获取微信头像
+export function getAvatarUrl(): string {
+  return wx.getStorageSync('avatarUrl')
 }

GuangZuan/typings/types/model/order.d.ts

@@ -1469,6 +1469,8 @@ declare namespace GuangZuan {
   
   /// 出售大厅委托单
   interface SellOrder {
+    /// 是否收藏
+    favorite: boolean
     /// 资金账号
     accountid: number
     /// 申请单ID