xxxxxx

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

@@ -6,6 +6,7 @@ import { getGoods, queryPermancePlanTmp } from "../../../services/api/orders/ind
 import { accountid, clientType, getErrorMsg, isEncrypted, loginid, marketid, protoHeader, timetample, userid } from "../../../services/utils"
 import { hideLoading, showLoading, showModel, showToast } from "../../../utils/message/index"
 import { encryptBody } from "../../../utils/websocket/crypto"
+import { isnullstr } from "../../../utils/util"
 
 Page({
 
@@ -24,7 +25,7 @@ Page({
     /// 卖单信息
     order: <GuangZuan.SellOrder>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
     /// 操作
     operator: 1,
     /// 委托时间
@@ -53,6 +54,7 @@ Page({
           hideLoading( ()=> {
             var obj = res.data
             obj.imagepath = (services.config.openApiUrl+obj.imagepath).replace('./uploadFile', '/uploadFile')
+            obj.mobile = isnullstr(res.data.mobile)
             this.setData({ goods: obj })
           })
         },

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

@@ -72,23 +72,28 @@
     </view>
     <view class="attribute-info__item">
       <text class="title">颜色：</text>
-      <text class="value">{{ goods.zscolortype1display }}~{{goods.zscolortype2display}}</text>
+      <text class="value" wx:if="{{ goods.zscategory === 4 }}">{{ goods.zscolortype1display }}</text>
+      <text class="value" wx:if="{{ goods.zscategory != 4 }}">{{ goods.zscolortype1display }}~{{goods.zscolortype2display}}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">净度：</text>
-      <text class="value">{{ goods.zsclaritytype1display }}~{{goods.zsclaritytype2display}}</text>
+      <text class="value" wx:if="{{ goods.zscategory === 4 }}">{{ goods.zsclaritytype1display }}</text>
+      <text class="value" wx:if="{{ goods.zscategory != 4 }}">{{ goods.zsclaritytype1display }}~{{goods.zsclaritytype2display}}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">切工：</text>
-      <text class="value">{{ goods.zscuttype1display }}~{{goods.zscuttype2display}}</text>
+      <text class="value" wx:if="{{ goods.zscategory === 4 }}">{{ goods.zscuttype1display }}</text>
+      <text class="value" wx:if="{{ goods.zscategory != 4 }}">{{ goods.zscuttype1display }}~{{goods.zscuttype2display}}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">抛光：</text>
-      <text class="value">{{ goods.zspolishtype1display }}~{{goods.zspolishtype2display}}</text>
+      <text class="value" wx:if="{{ goods.zscategory === 4 }}">{{ goods.zspolishtype1display }}</text>
+      <text class="value" wx:if="{{ goods.zscategory != 4 }}">{{ goods.zspolishtype1display }}~{{goods.zspolishtype2display}}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">荧光：</text>
-      <text class="value">{{ goods.zsfluorescencetype1display }}~{{goods.zsfluorescencetype2display}}</text>
+      <text class="value" wx:if="{{ goods.zscategory === 4 }}">{{ goods.zsfluorescencetype1display }}</text>
+      <text class="value" wx:if="{{ goods.zscategory != 4 }}">{{ goods.zsfluorescencetype1display }}~{{goods.zsfluorescencetype2display}}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">尺寸：</text>

GuangZuan/miniprogram/mHome/pages/jewelry/list/index.wxml

@@ -15,8 +15,7 @@
 <!-- 商品卡片 -->
 <view class="goodscard" style="padding-bottom: {{ safeBottom }}px;">
   <view class="goodscard-item" wx:for="{{ sellOrders }}" wx:for-item="itm" wx:for-index="idx" wx:key="idx" data-num="{{ idx }}" bindtap="onItemClick">
-    <van-image width="100%" radius="10px 10px 0px 0px" height="180px" use-loading-slot use-error-slot fit="cover" src="{{ itm.imagepath }}" >
-      <text slot="error">加载失败</text>
+    <van-image width="100%" radius="10px 10px 0px 0px" height="180px" use-loading-slot fit="cover" src="{{ itm.imagepath }}" >
       <van-loading slot="loading" type="spinner" size="20" vertical />
     </van-image>
     <text class="goods-title">{{ itm.zsstyletypedisplay }} {{ itm.totalqty }}ct {{ itm.settingmaterial }}</text>

GuangZuan/miniprogram/mHome/pages/presell/detail/index.ts

@@ -20,7 +20,7 @@ Page({
     /// 选中履约模板
     tmp: <GuangZuan.PermancePlanTmp>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
     /// banner图
     banners: ['']
   },

GuangZuan/miniprogram/mHome/pages/purchase/detail/index.ts

@@ -20,7 +20,7 @@ Page({
     /// 选中履约模板
     tmp: <GuangZuan.PermancePlanTmp>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
     /// banner图
     banners: [''],
     /// 预售认购列表查询

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

@@ -14,7 +14,7 @@
     </swiper-item>
   </swiper>
 
-  <view style="background-color: #f0f0f0; height: 10px; width: 100%;"></view>
+  <view style="background-color: #f0f0f0; height: 10px; width: 100%;" />
 
   <view class="container__top">
     <view class="container__top__row">
@@ -50,7 +50,7 @@
     </view>
   </view>
 
-  <view style="background-color: #f0f0f0; height: 10px; width: 100%;"></view>
+  <view style="background-color: #f0f0f0; height: 10px; width: 100%;" />
 
    <view class="container__diamondinfo">
      <text selectable="false">【钻石参考信息】</text>

GuangZuan/miniprogram/mHome/pages/purchase/new/index.ts

@@ -24,7 +24,7 @@ Page({
     /// 是否显示日历
     showCal: false,
     /// 颜色
-    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
+    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
     /// 是否开始日期
     isstart: true,
     /// 开始日期

GuangZuan/miniprogram/mMine/pages/myorders/mydelistingapplydetail/index.ts

@@ -1,10 +1,9 @@
 import { FunCode } from "../../../../constants/enum/funcode"
 import { EOrderSrc } from "../../../../constants/enum/index"
-import Dialog from "../../../../miniprogram_npm/@vant/weapp/dialog/dialog"
 import { sendMsgToMQ } from "../../../../services/api/common/index"
 import { queryWrPerformancePlanStep } from "../../../../services/api/orders/index"
 import { accountid, clientType, getErrorMsg, isEncrypted, marketid, protoHeader, timetample, userid } from "../../../../services/utils"
-import { hideLoading, showLoading, showModel, showToast } from "../../../../utils/message/index"
+import { hideLoading, showLoading, showModel } from "../../../../utils/message/index"
 import { encryptBody } from "../../../../utils/websocket/crypto"
 
 Page({

GuangZuan/miniprogram/mTrade/pages/delistingsell/index.ts

@@ -38,7 +38,7 @@ Page({
     /// 单据显示
     orderValue: { up: [''], dwn: ['']},
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick']
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown']
   },
 
   /**

GuangZuan/miniprogram/mTrade/pages/listingbuy/index.less

@@ -112,7 +112,7 @@
     margin-top: 20px;
   
     van-button {
-      width: 90%;
+      width: 95%;
     }
   }
   

GuangZuan/miniprogram/mTrade/pages/listingbuy/index.ts

@@ -15,7 +15,7 @@ Page({
     /// 底部安全区域
     safeBottom: getApp().globalData.safeBottom,
     /// 颜色
-    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
+    tcolors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
     /// tabs
     tabs: [{ id: 2, name: '单颗裸钻' }, { id: 5, name: '单颗彩钻' }],
     /// tab索引

GuangZuan/miniprogram/mTrade/pages/listingbuy/index.wxml

@@ -35,7 +35,7 @@
         </view>
       </view>
     </view>
-    <van-icon name="arrow"></van-icon>
+    <van-icon name="arrow" />
   </view>
 
   <!-- 货币 -->

GuangZuan/miniprogram/mTrade/pages/listingsell/index.ts

@@ -41,7 +41,7 @@ Page({
     /// 显示信息
     actions: [''],
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick']
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown']
   },
 
   /**

GuangZuan/miniprogram/mTrade/pages/orderdetail/index.less

@@ -106,7 +106,7 @@
 
     van-button {
       height: 40px;
-      width: 90%;
+      width: 95%;
     }
   }
 }

GuangZuan/miniprogram/mTrade/pages/orderdetail/index.ts

@@ -2,7 +2,7 @@ import { EOrderSrc } from "../../../constants/enum/index"
 import { FunCode } from "../../../constants/enum/funcode"
 import { sendMsgToMQ } from "../../../services/api/common/index"
 import { queryPermancePlanTmp } from "../../../services/api/orders/index"
-import { accountid, clientType, getErrorMsg, isEncrypted, loginid, marketid, protoHeader, timetample, userid } from "../../../services/utils"
+import { accountid, clientType, getErrorMsg, isEncrypted, loginid, protoHeader, timetample, userid } from "../../../services/utils"
 import { hideLoading, showLoading, showModel } from "../../../utils/message/index"
 import { encryptBody } from "../../../utils/websocket/crypto"
 import { formatDateString } from "../../../utils/util"
@@ -18,7 +18,7 @@ Page({
     /// 选中履约模板
     tmp: <GuangZuan.PermancePlanTmp>({}),
     /// 颜色
-    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick'],
+    colors: ['rebeccapurple', 'green', 'hotpink', 'orange', 'darkgoldenrod', 'firebrick', 'forestgreen', 'darksalmon', 'goldenrod', 'khaki', 'rosybrown', 'sandybrown'],
     /// 资金账户ID
     accountid: accountid()
   },

GuangZuan/miniprogram/mTrade/pages/orderdetail/index.wxml

@@ -64,7 +64,7 @@
 
   <!-- 询价信息 -->
   <view class="button-view">
-    <van-button wx:if="{{ order.accountid != accountid }}" id="close" block round color="#7232dd" bind:click="goToDelistingSell">摘牌申请</van-button>
+    <van-button wx:if="{{ order.accountid != accountid }}" id="close" block round color="#407DB8" bind:click="goToDelistingSell">摘牌申请</van-button>
     <van-button wx:if="{{ order.accountid === accountid && order.wrtradeorderstatus === 3 }}" id="close" block round color="#7232dd" bind:click="doWRListingCancelOrder">撤销</van-button>
   </view>
 </view>

GuangZuan/miniprogram/pages/home/index.wxml

@@ -55,7 +55,7 @@
     </view>
     <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" src="{{ itm.imageurl }}" />
+        <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>

GuangZuan/miniprogram/pages/mine/index.ts

@@ -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: "",
+    avatarUrl: wx.getStorageSync('avatarUrl'),
     /// 微信昵称
     nickName: '',
     /// 资金账户信息
@@ -86,11 +86,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-    /// 获取微信头像
-    let url = wx.getStorageSync('avatarUrl')
-    if (url) {
-      this.setData({  avatarUrl: url })
-    }
     this.setData({
       /// 设置账户信息
       ta: taAccount(accountid()),
@@ -101,6 +96,29 @@ Page({
   },
 
   /**
+   * 获取用户信息
+   */
+  getUserInfo(e: any) {
+    /// 如果不为空
+    if (this.data.avatarUrl != '') {
+      return
+    }
+    wx.getUserProfile({
+      desc: '获取微信头像',
+      success: (res) => {
+        /// 存储头像
+        wx.setStorageSync('avatarUrl', res.userInfo.avatarUrl)
+        /// 显示信息
+        this.setData({
+          avatarUrl: res.userInfo.avatarUrl
+        })
+      }, fail: () => {
+        showToast('获取用户头像失败！')
+      }
+    })
+  },
+
+  /**
    * 查询用户已签约信息
    */
   queryBankAccountSign() {

GuangZuan/miniprogram/pages/mine/index.wxml

@@ -3,7 +3,7 @@
   <view class="minetop" style="background-image: url('{{ imgUrl }}mine-bg.png'); background-size: 100% 100%; width: 100%; ">
     <text style="color: #000; font-size: 36rpx; height: {{ navHeight }}px; padding-top: {{ statusBarHeight }}px; align-content: center; align-items: center; display: flex; flex-direction: row;">我的</text>
     <view class="user-info" style="padding-top: 30px;">
-      <van-image src="{{ avatarUrl }}" round width="50" height="50" />
+      <van-image src="{{ avatarUrl }}" use-loading-slot round width="50" height="50" bind:click="getUserInfo" />
       <view class="userinfo">
         <view class="userinfo-vip">
           <text>{{ isOpenEye ? nickName : '******' }}</text>
@@ -43,7 +43,7 @@
   <!-- 功能菜单项 -->
   <van-grid column-num="5" 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 }}">
-      <image slot="icon" style="width: 25px; height: 25px;" src="{{ imgUrl+itm.img }}.png" />
+      <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>
     </van-grid-item>
   </van-grid>
@@ -53,7 +53,7 @@
   <!-- 列表菜单项 -->
   <van-cell-group>
     <van-cell clickable title-class="cell-title" size="large" center is-link border wx:for="{{ tablelists }}" clickable wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" title="{{ itm.title }}" link-type="navigateTo" url="{{ itm.path }}">
-      <image slot="icon" style="width: 25px; height: 25px;" src="{{ imgUrl+itm.iconfont }}.png" />
+      <van-image slot="icon" width="25" height="25" src="{{ imgUrl+itm.iconfont }}.png" />
     </van-cell>
   </van-cell-group>
 

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: {{ safeBottom+navHeight+15 }}px;">
+<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;">
   <!-- 数据 --> 
   <van-swipe-cell wx:for="{{ active === 0 ? sellOrders : askOrders }}" wx:for-item="itm" wx:for-index="idx" wx:key="wrtradeorderid" right-width="50">
     <view class="vanSwipeCell-item">

GuangZuan/miniprogram/services/utils.ts

@@ -11,8 +11,8 @@ export function getSteptype(typeid: number): string {
       return '买方支付'
       break;
     case 2:
-        return '卖方收款'
-        break;
+      return '卖方收款'
+      break;
     case 3:
       return '买方自提'
       break;
@@ -20,8 +20,8 @@ export function getSteptype(typeid: number): string {
       return '卖方发货'
       break;
     case 5:
-        return '买方确认货'
-        break;
+      return '买方确认货'
+      break;
     case 6:
       return '卖方发票'
       break;
@@ -29,8 +29,8 @@ export function getSteptype(typeid: number): string {
       return '买方确认票'
       break;
     case 8:
-        return '卖仓单转移'
-        break;
+      return '卖仓单转移'
+      break;
     case 9:
       return '释放卖方冻结'
       break;
@@ -38,8 +38,8 @@ export function getSteptype(typeid: number): string {
       return '货款溢短'
       break;
     case 11:
-        return '生成合同[中江]'
-        break;
+      return '生成合同[中江]'
+      break;
     case 12:
       return '运费'
       break;
@@ -47,8 +47,8 @@ export function getSteptype(typeid: number): string {
       return '确认支付'
       break;
     case 91:
-        return '确认放行'
-        break;
+      return '确认放行'
+      break;
     default:
       return '买方支付(直接扣款)'
       break;
@@ -62,8 +62,8 @@ export function getStepStatus(stepstatus: number): string {
       return '待开始'
       break;
     case 2:
-        return '进行中'
-        break;
+      return '进行中'
+      break;
     case 3:
       return '已完成'
       break;
@@ -71,8 +71,8 @@ export function getStepStatus(stepstatus: number): string {
       return '延期(进行中)'
       break;
     case 5:
-        return '失败'
-        break;
+      return '失败'
+      break;
     case 6:
       return '自动完成'
       break;
@@ -89,8 +89,8 @@ export function getPerformancestatus(status: number): string {
       return '待激活'
       break;
     case 2:
-        return '正常'
-        break;
+      return '正常'
+      break;
     case 3:
       return '处理错误'
       break;
@@ -98,8 +98,8 @@ export function getPerformancestatus(status: number): string {
       return '违约待处理'
       break;
     case 5:
-        return '违约处理中'
-        break;
+      return '违约处理中'
+      break;
     case 6:
       return '完成'
       break;
@@ -107,8 +107,8 @@ export function getPerformancestatus(status: number): string {
       return '违约已完成'
       break;
     case 8:
-        return '释放冻结失败 '
-        break;
+      return '释放冻结失败 '
+      break;
     case 9:
       return '超时待处理'
       break;