Handy_Cao преди 2 години
родител
ревизия
50be053ceb
променени са 24 файла, в които са добавени 113 реда и са изтрити 110 реда
  1. 2 2
      GuangZuan/miniprogram/components/num-range/num-range.wxml
  2. 1 1
      GuangZuan/miniprogram/components/tabbar/index.wxml
  3. 17 17
      GuangZuan/miniprogram/mCircle/pages/contrast/index.wxml
  4. 10 10
      GuangZuan/miniprogram/mHome/pages/bond/payment/index.wxml
  5. 8 8
      GuangZuan/miniprogram/mHome/pages/bond/prepayment/index.wxml
  6. 5 5
      GuangZuan/miniprogram/mHome/pages/goodsdetail/index.wxml
  7. 11 11
      GuangZuan/miniprogram/mHome/pages/inspection/payment/index.wxml
  8. 10 10
      GuangZuan/miniprogram/mHome/pages/inspection/prepayment/index.wxml
  9. 5 10
      GuangZuan/miniprogram/mHome/pages/jewelry/list/index.less
  10. 6 1
      GuangZuan/miniprogram/mHome/pages/jewelry/list/index.ts
  11. 4 1
      GuangZuan/miniprogram/mHome/pages/jewelry/list/index.wxml
  12. 1 1
      GuangZuan/miniprogram/mHome/pages/msg/msglist/index.wxml
  13. 1 1
      GuangZuan/miniprogram/mHome/pages/search/index.wxml
  14. 3 3
      GuangZuan/miniprogram/mMine/pages/about/about/index.wxml
  15. 1 1
      GuangZuan/miniprogram/mMine/pages/address/operate/index.wxml
  16. 9 9
      GuangZuan/miniprogram/mMine/pages/inoutgold/index.wxml
  17. 1 1
      GuangZuan/miniprogram/mMine/pages/invoice/operate/index.wxml
  18. 1 1
      GuangZuan/miniprogram/mMine/pages/myperformance/breach/index.wxml
  19. 2 2
      GuangZuan/miniprogram/mMine/pages/myperformance/modify/index.wxml
  20. 1 1
      GuangZuan/miniprogram/mTrade/pages/listingbuy/index.wxml
  21. 1 1
      GuangZuan/miniprogram/pages/home/index.ts
  22. 5 5
      GuangZuan/miniprogram/pages/home/index.wxml
  23. 5 5
      GuangZuan/miniprogram/pages/mine/index.wxml
  24. 3 3
      GuangZuan/miniprogram/pages/trade/index.wxml

+ 2 - 2
GuangZuan/miniprogram/components/num-range/num-range.wxml

@@ -1,13 +1,13 @@
 <view class="content">
   <!-- 左边视图 -->
   <view class="left">
-    <input id="min" value="{{min}}" placeholder="请输入数值" input="digit" style="width: 100%; text-align: center;" bindinput="valueInput"></input>
+    <input id="min" value="{{min}}" placeholder="请输入数值" input="digit" style="width: 100%; text-align: center;" bindinput="valueInput" />
     <text class="unit" style="width: 30px; font-size: 11px;">{{unit}}</text>
   </view>
   <text style="text-align: center; width: 30px;">~</text>
   <!-- 右边边视图 -->
   <view class="right">
-    <input id="max" value="{{max}}" style="width: 100%; text-align: center;" placeholder="请输入数值" input="digit" bindinput="valueInput"></input>
+    <input id="max" value="{{max}}" style="width: 100%; text-align: center;" placeholder="请输入数值" input="digit" bindinput="valueInput" />
     <text class="unit" style="width: 30px; font-size: 11px;">{{unit}}</text>
   </view>
 </view>

+ 1 - 1
GuangZuan/miniprogram/components/tabbar/index.wxml

@@ -5,7 +5,7 @@
                 <!--判断是否图片图标-->
                 <block wx:if="{{ item.icon }}">
                     <view class="cat-icon {{['cat-icon-' + item.name, active === index ? 'active' : '']}}">
-                        <image class="image" src="{{ item.aicon }}.png" wx:if="{{ active === index }}"></image>
+                        <image class="image" src="{{ item.aicon }}.png" wx:if="{{ active === index }}" />
                         <image class="image" src="{{ item.icon }}.png" wx:else></image>
                         <text class="text">{{ item.label }}</text>
                     </view>

+ 17 - 17
GuangZuan/miniprogram/mCircle/pages/contrast/index.wxml

@@ -9,13 +9,13 @@
   <!-- 图片区域 -->
   <view class="image-view">
     <!-- 空白处 -->
-    <view style="width: 80px;"></view>
+    <view style="width: 80px;" />
     
     <view class="item-image-view" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">
       <!-- 图片 -->
-      <van-image src="https://img.yzcdn.cn/vant/cat.jpeg" width="50" height="50"></van-image>
+      <van-image src="https://img.yzcdn.cn/vant/cat.jpeg" width="50" height="50" />
       <!-- 商品编号 -->
-      <text class="goodsno">{{itm.goodsno}}</text>
+      <text class="goodsno">{{ itm.goodsno }}</text>
     </view>
   </view>
 </view>
@@ -25,84 +25,84 @@
   <!-- 重量 -->
   <view class="item weight">
     <text class="title">重量</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.weight}}ct</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.weight }}ct</text>
   </view>
 
   <!-- 价格 -->
   <view class="item price">
     <text class="title">价格</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">¥{{itm.price}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">¥{{ itm.price }}</text>
   </view>
 
   <!-- 克拉单价 -->
   <view class="item priceper">
     <text class="title">克拉单价</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">¥{{itm.priceper}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">¥{{ itm.priceper }}</text>
   </view>
 
   <!-- 市场价 -->
   <view class="item marketprice">
     <text class="title">市场价</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">¥{{itm.marketprice}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">¥{{ itm.marketprice }}</text>
   </view>
 
   <!-- 仓库 -->
   <view class="item warehousenamedisplay">
     <text class="title">仓库</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.warehousenamedisplay}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.warehousenamedisplay }}</text>
   </view>
 
   <!-- 卖家 -->
   <view class="item sellusername">
     <text class="title">卖家</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.sellusername}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.sellusername }}</text>
   </view>
 
   <!-- 形状 -->
   <view class="item zsshapetypedisplay">
     <text class="title">形状</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zsshapetypedisplay}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.zsshapetypedisplay }}</text>
   </view>
 
   <!-- 颜色 -->
   <view class="item zscolortype1display">
     <text class="title">颜色</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zscolortype1display}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.zscolortype1display }}</text>
   </view>
 
   <!-- 净度 -->
   <view class="item zsclaritytype1display">
     <text class="title">净度</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zsclaritytype1display}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.zsclaritytype1display }}</text>
   </view>
 
   <!-- 切工 -->
   <view class="item zscuttype1display">
     <text class="title">切工</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zscuttype1display}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.zscuttype1display }}</text>
   </view>
 
   <!-- 对称 -->
   <view class="item zsfluorescencetype1display">
     <text class="title">对称</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zsfluorescencetype1display}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.zsfluorescencetype1display }}</text>
   </view>
 
   <!-- 荧光 -->
   <view class="item zspolishtype1display">
     <text class="title">荧光</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zspolishtype1display}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.zspolishtype1display }}</text>
   </view>
 
   <!-- 尺寸 -->
   <view class="item sizedisplay">
     <text class="title">尺寸</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.sizedisplay}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.sizedisplay }}</text>
   </view>
 
   <!-- 证书 -->
   <view class="item zscerttypedisplay">
     <text class="title">证书</text>
-    <text class="value" wx:for="{{values}}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{itm.zscerttypedisplay}}</text>
+    <text class="value" wx:for="{{ values }}" wx:for-index="idx" wx:for-item="itm" wx:key="idx">{{ itm.zscerttypedisplay }}</text>
   </view>
 </view>

+ 10 - 10
GuangZuan/miniprogram/mHome/pages/bond/payment/index.wxml

@@ -10,16 +10,16 @@
 
   <view class="container__content" wx:if="{{ operator }}">
     <van-cell-group>
-      <van-cell title="单据编号" value="{{ orderid }}"></van-cell>
-      <van-cell title="综合服务费" value="{{ operator.servicefee }}"></van-cell>
-      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}"></van-cell>
-      <van-cell title="税费保证金" value="{{ operator.taxmargin }}"></van-cell>
-      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}"></van-cell>
-      <van-cell title="其它费用" value="{{ operator.taxmargin }}"></van-cell>
-      <van-cell title="总共应收" value="{{ operator.totalfee }}"></van-cell>
-      <van-cell title="预收款" value="{{ operator.advanceamount }}"></van-cell>
-      <van-cell title="应收\应退" value="{{ operator.settleamount-operator.advanceamount }}"></van-cell>
-      <van-cell title="账户余额" value="{{ ta.currentbalance }}"></van-cell>
+      <van-cell title="单据编号" value="{{ orderid }}" />
+      <van-cell title="综合服务费" value="{{ operator.servicefee }}" />
+      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}" />
+      <van-cell title="税费保证金" value="{{ operator.taxmargin }}" />
+      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}" />
+      <van-cell title="其它费用" value="{{ operator.taxmargin }}" />
+      <van-cell title="总共应收" value="{{ operator.totalfee }}" />
+      <van-cell title="预收款" value="{{ operator.advanceamount }}" />
+      <van-cell title="应收\应退" value="{{ operator.settleamount-operator.advanceamount }}" />
+      <van-cell title="账户余额" value="{{ ta.currentbalance }}" />
     </van-cell-group>
   </view>
 

+ 8 - 8
GuangZuan/miniprogram/mHome/pages/bond/prepayment/index.wxml

@@ -10,14 +10,14 @@
 
   <view class="container__content" wx:if="{{ operator }}">
     <van-cell-group>
-      <van-cell title="单据编号" value="{{ orderid }}"></van-cell>
-      <van-cell title="税费保证金" value="{{ operator.taxmargin }}"></van-cell>
-      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}"></van-cell>
-      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}"></van-cell>
-      <van-cell title="综合服务费" value="{{ operator.servicefee }}"></van-cell>
-      <van-cell title="其它费用" value="{{ operator.otherfee }}"></van-cell>
-      <van-cell title="总共" value="{{ operator.totalfee }}"></van-cell>
-      <van-cell title="账户可用余额" value="{{ ta.currentbalance }}"></van-cell>
+      <van-cell title="单据编号" value="{{ orderid }}" />
+      <van-cell title="税费保证金" value="{{ operator.taxmargin }}" />
+      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}" />
+      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}" />
+      <van-cell title="综合服务费" value="{{ operator.servicefee }}" />
+      <van-cell title="其它费用" value="{{ operator.otherfee }}" />
+      <van-cell title="总共" value="{{ operator.totalfee }}" />
+      <van-cell title="账户可用余额" value="{{ ta.currentbalance }}" />
     </van-cell-group>
   </view>
 

+ 5 - 5
GuangZuan/miniprogram/mHome/pages/goodsdetail/index.wxml

@@ -8,10 +8,10 @@
   </view>
 
   <!-- banner轮播图 -->
-  <swiper class="banner" wx:if="{{banners.count != 0}}" indicator-active-color="orange" indicator-dots autoplay interval="5000" circular>
-    <swiper-item class="banner_item" wx:for="4" wx:key="index" id="{{item}}">
+  <swiper class="banner" wx:if="{{ banners.count != 0 }}" indicator-active-color="orange" indicator-dots autoplay interval="5000" circular>
+    <swiper-item class="banner_item" wx:for="4" wx:key="index" id="{{ item }}">
       <view class="swiper-item">
-        <image src='https://img.yzcdn.cn/vant/cat.jpeg' mode="widthFix"></image>
+        <image src='https://img.yzcdn.cn/vant/cat.jpeg' mode="widthFix" />
       </view>
     </swiper-item>
   </swiper>
@@ -27,10 +27,10 @@
       </view>
       <view class="content__item">
         <text class="content__item__weight">重量:{{ goods.weightavg }} 克拉</text>
-        <text class="content__item__gprice">克拉单价:$ {{ goods.priceper }}</text>
+        <text class="content__item__gprice">克拉单价:{{ goods.zscurrencytypedisplayunit+goods.priceper }}</text>
       </view>
       <view class="content__item">
-        <text class="content__item__price">市场价:{{ goods.marketprice }}</text>
+        <text class="content__item__price">市场价:{{ goods.zscurrencytypedisplayunit+goods.marketprice }}</text>
         <text class="content__item__ordertime">挂牌时间:{{ ordertime }}</text>
       </view>
   </view>

+ 11 - 11
GuangZuan/miniprogram/mHome/pages/inspection/payment/index.wxml

@@ -10,17 +10,17 @@
 
   <view class="container__content" wx:if="{{ operator }}">
     <van-cell-group>
-      <van-cell title="单据编号" value="{{ order.orderid }}"></van-cell>
-      <van-cell title="综合服务费" value="{{ operator.servicefee }}"></van-cell>
-      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}"></van-cell>
-      <van-cell title="GIA检测费" value="{{ operator.giarmbfee }}"></van-cell>
-      <van-cell title="海关税费" value="{{ operator.customsfee }}"></van-cell>
-      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}"></van-cell>
-      <van-cell title="其它费用" value="{{ operator.otherfee }}"></van-cell>
-      <van-cell title="总共" value="{{ operator.totalfee }}"></van-cell>
-      <van-cell title="预收款" value="{{ operator.advanceamount }}"></van-cell>
-      <van-cell title="应收\应退" value="{{ operator.settleamount-operator.advanceamount }}"></van-cell>
-      <van-cell title="账户余额" value="{{ ta.currentbalance }}"></van-cell>
+      <van-cell title="单据编号" value="{{ order.orderid }}" />
+      <van-cell title="综合服务费" value="{{ operator.servicefee }}" />
+      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}" />
+      <van-cell title="GIA检测费" value="{{ operator.giarmbfee }}" />
+      <van-cell title="海关税费" value="{{ operator.customsfee }}" />
+      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}" />
+      <van-cell title="其它费用" value="{{ operator.otherfee }}" />
+      <van-cell title="总共" value="{{ operator.totalfee }}" />
+      <van-cell title="预收款" value="{{ operator.advanceamount }}" />
+      <van-cell title="应收\应退" value="{{ operator.settleamount-operator.advanceamount }}" />
+      <van-cell title="账户余额" value="{{ ta.currentbalance }}" />
     </van-cell-group>
   </view>
 

+ 10 - 10
GuangZuan/miniprogram/mHome/pages/inspection/prepayment/index.wxml

@@ -10,16 +10,16 @@
 
   <view class="container__content" wx:if="{{ operator}}">
     <van-cell-group>
-      <van-cell title="单据编号" value="{{ order.orderid }}"></van-cell>
-      <van-cell title="GIA检测费" value="{{ operator.giarmbfee }}"></van-cell>
-      <van-cell title="折合人民币" value="{{ operator.giarmbfee*operator.exchangerate }}"></van-cell>
-      <van-cell title="海关税费" value="{{ operator.customsfee }}"></van-cell>
-      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}"></van-cell>
-      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}"></van-cell>
-      <van-cell title="综合服务费" value="{{ operator.servicefee }}"></van-cell>
-      <van-cell title="其它费用" value="{{ operator.otherfee }}"></van-cell>
-      <van-cell title="总共" value="{{ operator.totalfee }}"></van-cell>
-      <van-cell title="账户可用余额" value="{{ ta.currentbalance }}"></van-cell>
+      <van-cell title="单据编号" value="{{ order.orderid }}" />
+      <van-cell title="GIA检测费" value="{{ operator.giarmbfee }}" />
+      <van-cell title="折合人民币" value="{{ operator.giarmbfee*operator.exchangerate }}" />
+      <van-cell title="海关税费" value="{{ operator.customsfee }}" />
+      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}" />
+      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}" />
+      <van-cell title="综合服务费" value="{{ operator.servicefee }}" />
+      <van-cell title="其它费用" value="{{ operator.otherfee }}" />
+      <van-cell title="总共" value="{{ operator.totalfee }}" />
+      <van-cell title="账户可用余额" value="{{ ta.currentbalance }}" />
     </van-cell-group>
   </view>
 

+ 5 - 10
GuangZuan/miniprogram/mHome/pages/jewelry/list/index.less

@@ -15,23 +15,18 @@ Page {
   flex-wrap: wrap;
   align-items: center;
   align-content: center;
-  margin: 5px;
+  margin: 5px 10px;
   
   .goodscard-item {
-    width: 48%;
+    width: 48.5%;
+    height: 280px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     background-color: white;
     border-radius: 10px;
-    margin-top: 5px;
-    box-shadow: 10px 10px 10px #ddd;
-    margin-bottom: 10px;
-
-    .goods-icon {
-      width: 100%;
-      border-radius: 10px 10px 0px 0px;
-    }
+    margin-top: 10px;
+    box-shadow: 5px 5px 5px #ddd;
 
     .goods-title {
       font-size: 13px;

+ 6 - 1
GuangZuan/miniprogram/mHome/pages/jewelry/list/index.ts

@@ -1,3 +1,4 @@
+import services from "../../../../services/index";
 import { querySellOrder } from "../../../../services/api/orders/index";
 import { userid } from "../../../../services/utils";
 import { hideLoading, showLoading } from "../../../../utils/message/index";
@@ -77,7 +78,11 @@ Page({
           hideLoading(()=>{
             /// 数据赋值
             this.setData({ 
-              sellOrders: this.data.page == 1 ? res.data : this.data.sellOrders.concat(res.data),
+              sellOrders: (this.data.page == 1 ? res.data : this.data.sellOrders.concat(res.data)).map(itm => {
+                var obj = itm
+                obj.imagepath = (services.config.openApiUrl+itm.imagepath).replace('./uploadFile', '/uploadFile')
+                return obj
+              }),
             })
             this.setData({ isEmpty: this.data.sellOrders.length === 0})
           })

+ 4 - 1
GuangZuan/miniprogram/mHome/pages/jewelry/list/index.wxml

@@ -15,7 +15,10 @@
 <!-- 商品卡片 -->
 <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">
-    <image class="goods-icon" mode="widthFix" src="https://img.yzcdn.cn/vant/cat.jpeg"></image>
+    <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-loading slot="loading" type="spinner" size="20" vertical />
+    </van-image>
     <text class="goods-title">{{ itm.zsstyletypedisplay }}{{ itm.totalqty }}ct{{ itm.stonedesc }}</text>
     <text class="goods-price">{{ itm.zscurrencytypedisplayunit }}{{ itm.price }}</text>
   </view>

+ 1 - 1
GuangZuan/miniprogram/mHome/pages/msg/msglist/index.wxml

@@ -6,7 +6,7 @@
 
 <!-- tabs -->
 <van-tabs animated bind:change="onChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9">
-  <van-tab wx:for="{{ tabs }}" wx:key="id" title="{{ item.title }}"></van-tab>
+  <van-tab wx:for="{{ tabs }}" wx:key="id" title="{{ item.title }}" />
 </van-tabs>
 
 <van-cell-group>

+ 1 - 1
GuangZuan/miniprogram/mHome/pages/search/index.wxml

@@ -91,7 +91,7 @@
   <!-- 克拉重量 -->
   <view class="cell-view ctweight"> 
     <text class="label">克拉重量</text>
-    <num-range min="{{minweight}}" max="{{maxweight}}" bind:sync="syncNumRange"></num-range>
+    <num-range min="{{minweight}}" max="{{maxweight}}" bind:sync="syncNumRange" />
   </view>
 
   <!--  底部视图  -->

+ 3 - 3
GuangZuan/miniprogram/mMine/pages/about/about/index.wxml

@@ -15,6 +15,6 @@
 
 <!-- van-cell-group -->
 <van-cell-group>
-    <van-cell title="隐私政策" is-link />
-    <van-cell title="用户协议" is-link />
-  </van-cell-group>
+  <van-cell title="隐私政策" is-link />
+  <van-cell title="用户协议" is-link />
+</van-cell-group>

+ 1 - 1
GuangZuan/miniprogram/mMine/pages/address/operate/index.wxml

@@ -13,7 +13,7 @@
   <view class="region">
     <text class="label">*收货地区</text>
     <view class="region-selsct" id="region-selsct" bindtap="onButtonPressed">{{region}}</view>
-    <van-icon name="arrow" size="10px" color="#666"></van-icon>
+    <van-icon name="arrow" size="10px" color="#666" />
   </view>
 
   <view class="default" wx:if="{{autoid != 0}}">

+ 9 - 9
GuangZuan/miniprogram/mMine/pages/inoutgold/index.wxml

@@ -21,7 +21,7 @@
     <!-- 充值金额 -->
     <view class="item amount">
       <text class="title">充值金额</text>
-      <van-field id="into-amount-field" model:value="{{inamount}}" clearable type="digit" adjust-position border="{{false}}" placeholder="请输入充值金额"></van-field>
+      <van-field id="into-amount-field" model:value="{{inamount}}" clearable type="digit" adjust-position border="{{false}}" placeholder="请输入充值金额" />
     </view>
 
     <!-- 凭证 -->
@@ -30,18 +30,18 @@
       <view class="credentials-top-view">
         <text class="value">请上传银行充值流水截图</text>
         <!-- 凭证图片 -->
-        <view class="upload"><van-uploader max-count="1" deletable="{{true}}" file-list="{{ fileList }}" bind:after-read="afterRead" bind:delete="deleteImage"></van-uploader></view> 
+        <view class="upload"><van-uploader max-count="1" deletable="{{true}}" file-list="{{ fileList }}" bind:after-read="afterRead" bind:delete="deleteImage"  /></view> 
       </view>
     </view>
   </view>
 
   <!-- 出金视图 -->
-  <view class="out-gold-view" wx:if="{{active == 1}}">
+  <view class="out-gold-view" wx:if="{{ active == 1 }}">
     <!-- 提现金额 -->
     <view class="item out-amount" id="item-out-amount">
       <text class="title">提现金额</text>
       <view class="out-amount-view">
-        <van-field id="out-amount-field" model:value="{{outamount}}" clearable type="digit" adjust-position border="{{false}}" placeholder="请输入提现金额"></van-field>
+        <van-field id="out-amount-field" model:value="{{ outamount }}" clearable type="digit" adjust-position border="{{ false }}" placeholder="请输入提现金额" />
         <view class="enable-out-amount-view">
           <text class="enable-out-amount">可提现金额:{{enableOutAmount}}</text>
           <van-button id="allamount" color="#F7A657" round type="mini" bind:click="onButtonPressed">全部</van-button>
@@ -52,30 +52,30 @@
     <!-- 开户银行 -->
     <view class="item bankName">
       <text class="title">开户银行</text>
-      <text class="value">{{sign.bankname}}</text>
+      <text class="value">{{ sign.bankname }}</text>
     </view>
 
     <!-- 银行卡号 -->
     <view class="item banNo">
       <text class="title">银行卡号</text>
-      <text class="value">{{sign.cardno}}</text>
+      <text class="value">{{ sign.cardno }}</text>
     </view>
 
     <!-- 姓名 -->
     <view class="item accountName">
       <text class="title">姓名</text>
-      <text class="value">{{sign.bankaccountname}}</text>
+      <text class="value">{{ sign.bankaccountname }}</text>
     </view>
 
     <!-- 支行名称 -->
     <view class="item branchBankName">
       <text class="title">支行名称</text>
-      <text class="value">{{sign.branchbankname}}</text>
+      <text class="value">{{ sign.branchbankname }}</text>
     </view>
   </view>
 
   <!-- 提现时间 -->
-  <view class="inout-time-view"><text class="inout-time">提现时间:{{time}}</text></view>
+  <view class="inout-time-view"><text class="inout-time">提现时间:{{ time }}</text></view>
 
   <!-- 按钮 -->
   <view class="button-view">

+ 1 - 1
GuangZuan/miniprogram/mMine/pages/invoice/operate/index.wxml

@@ -10,7 +10,7 @@
   <view class="type">
     <text class="label">发票类型</text>
     <view class="type-selsct" id="type-selsct" bindtap="onButtonPressed">{{type == 1 ? "个人" : "企业"}}</view>
-    <van-icon name="arrow" size="10px" color="#666"></van-icon>
+    <van-icon name="arrow" size="10px" color="#666" />
   </view>
 
   <!-- 发票抬头 --> 

+ 1 - 1
GuangZuan/miniprogram/mMine/pages/myperformance/breach/index.wxml

@@ -23,7 +23,7 @@
       <view class="credentials-top-view">
         <text class="value">请上传相关截图</text>
         <!-- 凭证图片 -->
-        <view class="upload"><van-uploader max-count="1" deletable="{{true}}" file-list="{{ fileList }}" bind:after-read="afterRead" bind:delete="deleteImage"></van-uploader></view> 
+        <view class="upload"><van-uploader max-count="1" deletable="{{true}}" file-list="{{ fileList }}" bind:after-read="afterRead" bind:delete="deleteImage" /></view> 
       </view>
     </view>
 

+ 2 - 2
GuangZuan/miniprogram/mMine/pages/myperformance/modify/index.wxml

@@ -16,13 +16,13 @@
   <view class="address-info">
     <text>收货地址:</text>
     <textarea class="text-area" model:value="{{ address }}" placeholder="请输入收货地址"></textarea>
-    <van-icon id="address" name="plus" size="20"></van-icon>
+    <van-icon id="address" name="plus" size="20" />
   </view>
 
   <view class="invoice-info">
     <text>发票信息:</text>
     <textarea class="text-area" model:value="{{ invoice }}" placeholder="请输入发票信息"></textarea>
-    <van-icon id="invoice" name="plus" size="20"></van-icon>
+    <van-icon id="invoice" name="plus" size="20" />
   </view>
 
   <!-- 按钮 -->

+ 1 - 1
GuangZuan/miniprogram/mTrade/pages/listingbuy/index.wxml

@@ -45,7 +45,7 @@
   <view class="cell-view size"> 
     <text class="title">尺寸</text>
     <view class="content size">
-      <num-range class="size-num" min="{{ minSize }}" max="{{ maxSize }}" unit="mm" bind:sync="syncNumRange"></num-range>
+      <num-range class="size-num" min="{{ minSize }}" max="{{ maxSize }}" unit="mm" bind:sync="syncNumRange" />
     </view>
   </view>
 

+ 1 - 1
GuangZuan/miniprogram/pages/home/index.ts

@@ -141,7 +141,7 @@ Page({
                 obj.imageurl = (services.config.openApiUrl+itm.imageurl).replace('./uploadFile', '/uploadFile')
                 obj.membertagsdisplay = itm.membertags.split(',')
                 return obj
-             }),
+              }),
               isEmpty: res.data.length === 0
             })
           })

+ 5 - 5
GuangZuan/miniprogram/pages/home/index.wxml

@@ -1,7 +1,7 @@
 <!-- 头部视图 -->
 <view class="top-view" style="position: sticky; top: 0; z-index: 999;"> 
   <!-- 导航栏 -->
-  <nav-bar title="广州钻石交易中心" bgColor="#fff" titleColor="#000" left="{{ false }}"></nav-bar>
+  <nav-bar title="广州钻石交易中心" bgColor="#fff" titleColor="#000" left="{{ false }}" />
 </view>
 
 <scroll-view style="padding-bottom: 80px; background-color: #f0f0f0;" scroll-y>
@@ -14,7 +14,7 @@
     <swiper class="banner" wx:if="{{ banners.count != 0 }}" indicator-active-color="orange" indicator-dots autoplay interval="5000" circular>
       <swiper-item class="banner_item" wx:for="{{ banners }}" wx:key="index" id="{{ item }}">
         <view class="swiper-item" style="border-radius: 10px;">
-          <image src='{{ item }}' mode="scaleToFill"></image>
+          <image src='{{ item }}' mode="scaleToFill" />
         </view>
       </swiper-item>
     </swiper>
@@ -40,12 +40,12 @@
     </van-grid>
   </view>
 
-  <view wx:if="{{ msgs.length != 0 }}" style="background-color: #f0f0f0; width: 100%; height: 15px;"></view>
+  <view wx:if="{{ msgs.length != 0 }}" style="background-color: #f0f0f0; width: 100%; height: 15px;" />
 
   <!-- 通知栏 -->
   <van-notice-bar wx:if="{{ msgs.length != 0 }}" left-icon="volume-o" mode="link" bind:click="goToMsg" color="#333" background="#fff" text="{{ notice.title }}" scrollable />
 
-  <view style="background-color: #f0f0f0; width: 100%; height: 15px;"></view>
+  <view style="background-color: #f0f0f0; width: 100%; height: 15px;" />
 
   <!-- 会员风采 -->
   <view class="memberinfo" style="background-color: white;">
@@ -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>
+        <van-image width="70" height="70" radius="10" fit="cover" src="{{ itm.imageurl }}" />
         <view class="memberinfo__list__item__right">
           <view class="memberinfo__list__item__right__top">
             <text class="goodsname">{{ itm.membername }}</text>

+ 5 - 5
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>
+      <van-image src="{{ avatarUrl }}" round width="50" height="50" />
       <view class="userinfo">
         <view class="userinfo-vip">
           <text>{{ isOpenEye ? nickName : '******' }}</text>
@@ -38,22 +38,22 @@
     </view>
   </view>
 
-  <view style="background-color: #f0f0f0; height: 10px;"></view>
+  <view style="background-color: #f0f0f0; height: 10px;" />
 
   <!-- 功能菜单项 -->
   <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"></image>
+      <image slot="icon" style="width: 25px; height: 25px;" src="{{ imgUrl+itm.img }}.png" />
       <text slot="text" style="font-size: 14px;">{{ itm.title }}</text>
     </van-grid-item>
   </van-grid>
 
-  <view style="background-color: #f0f0f0; height: 10px;"></view>
+  <view style="background-color: #f0f0f0; height: 10px;" />
 
   <!-- 列表菜单项 -->
   <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"></image>
+      <image slot="icon" style="width: 25px; height: 25px;" src="{{ imgUrl+itm.iconfont }}.png" />
     </van-cell>
   </van-cell-group>
 

+ 3 - 3
GuangZuan/miniprogram/pages/trade/index.wxml

@@ -11,7 +11,7 @@
       <!-- 功能区 -->
       <view class="gird-view">
         <view class="gird-view__item" wx:for="{{ menus }}" wx:for-index="idx" wx:for-item="itm" wx:key="id" id="{{ itm.id }}" bindtap="onIconClick">
-          <image src="{{ itm.icon }}.png" mode="heightFix"></image>
+          <image src="{{ itm.icon }}.png" mode="heightFix" />
           <text style="color: #CAE5FF; font-size: 12px;">{{ itm.title }}</text>
         </view>
       </view>
@@ -55,11 +55,11 @@
           <text wx:if="{{ active === 0 }}">证书:--</text>
         </view>
         <view class="vanSwipeCell-item__mid__right" id="favorite {{ idx }}" wx:if="{{ active === 0 }}" bindtap="onButtonPressed">
-          <van-icon name="star" color="#407DB8"></van-icon>
+          <van-icon name="star" color="#407DB8" />
           <text>已收藏</text>
         </view>
         <view class="vanSwipeCell-item__mid__right" id="delisting {{ idx }}" wx:if="{{ active === 1 }}" bindtap="onButtonPressed">
-          <van-icon name="fire-o" color="#407DB8"></van-icon>
+          <van-icon name="fire-o" color="#407DB8" />
           <text>去摘牌</text>
         </view>
       </view>