Bug Fixed

GuangZuan/miniprogram/layouts/view/index.wxml

@@ -5,7 +5,7 @@
     </view>
     <view class="cat-view__container">
         <cat-statusbar background-color="{{ statusBarFixedStyle.backgroundColor }}" wx:if="{{ navBarFixed }}"></cat-statusbar>
-        <view class="cat-view__container-navbar {{ navBarFixed ? 'fixed' : ''}}" style="opacity:{{navBarFixed ? navBarOpacity : 1 }}">
+        <view class="cat-view__container-navbar {{ navBarFixed ? 'fixed' : ''}}" style="opacity:{{ navBarFixed ? navBarOpacity : 1 }}">
             <slot name="navbar"></slot>
         </view>
         <cat-scroll-view class="cat-view__container-main" bind:scroll="onScroll">

GuangZuan/miniprogram/mCircle/pages/contrast/index.wxml

@@ -3,7 +3,7 @@
   <!-- 导航栏 -->
   <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>
+    <text slot="title" style="color: #fff;">钻石对比</text>
   </van-nav-bar>
 
   <!-- 图片区域 -->
@@ -13,7 +13,7 @@
     
     <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 src="{{ itm.imagepath }}" show-error="加载失败" width="50" height="50" />
       <!-- 商品编号 -->
       <text class="goodsno">{{ itm.goodsno }}</text>
     </view>
@@ -31,19 +31,19 @@
   <!-- 价格 -->
   <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.zscurrencytypedisplayunit+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.zscurrencytypedisplayunit+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.zscurrencytypedisplayunit+itm.marketprice }}</text>
   </view>
 
   <!-- 仓库 -->

GuangZuan/miniprogram/mMine/pages/myinventorys/list/index.less

@@ -40,6 +40,14 @@
     .title-view-up {
       border-bottom: 1px solid #ddd;
       padding-bottom: 5px;
+
+      text {
+        width: 25%;
+      }
+
+      text:nth-child(1) {
+        width: 40px;
+      }
     }
 
     .title-view-mid {
@@ -96,6 +104,10 @@
     text {
       width: 25%;
     }
+    
+    text:nth-child(1) {
+      width: 40px;
+    }
   }
 }
 

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

@@ -18,7 +18,7 @@
         justify-content: start;
         align-items: center;
         align-content: center;
-        margin-left: 15px;
+        margin-left: 10px;
   
         &__item {
           display: flex;
@@ -28,9 +28,8 @@
           padding-top: 10px;
   
           text {
-            font-size: 13px;
-            padding: 2.5px;
-            width: 100px;
+            font-size: 12px;
+            padding: 2.5px 5px;
             text-align: center;
           }
         }
@@ -38,13 +37,13 @@
     }
 
     .tmp_view {
-
       &__step {
         display: flex;
         flex-direction: row;
         justify-content: start;
         align-items: center;
         align-content: center;
+        width: 100%;
         margin-left: 15px;
   
         &__item {
@@ -53,11 +52,11 @@
           align-items: center;
           align-content: center;
           padding-top: 10px;
+          margin-bottom: 5px;
   
           text {
-            font-size: 13px;
-            padding: 2.5px;
-            width: 100px;
+            font-size: 12px;
+            padding: 2.5px 5px;
             text-align: center;
           }
         }

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

@@ -38,18 +38,20 @@
         justify-content: start;
         align-items: center;
         align-content: center;
-        padding: 10px 0px;
+        width: 100%;
+        margin: 5px 0px;
   
         &__item {
           display: flex;
           flex-direction: column;
           align-items: center;
           align-content: center;
+          padding-top: 10px;
+          margin-bottom: 5px;
   
           text {
-            font-size: 13px;
-            padding: 2.5px;
-            width: 100px;
+            font-size: 12px;
+            padding: 2.5px 5px;
             text-align: center;
           }
         }

GuangZuan/miniprogram/pages/circle/index.ts

@@ -6,6 +6,7 @@ import { FunCode } from "../../constants/enum/funcode";
 import { isnullstr } from "../../utils/util";
 import { hideLoading, showLoading } from "../../utils/message/index";
 import { encryptBody } from "../../utils/websocket/crypto";
+import services from "../../services/index";
 
 Page({
 
@@ -151,7 +152,11 @@ Page({
           hideLoading(()=>{
             /// 数据赋值
             this.setData({ 
-              favorites: res.data,
+              favorites: res.data.map(itm => {
+                var obj = itm
+                obj.imagepath = (services.config.openApiUrl+itm.imagepath).replace('./uploadFile', '/uploadFile')
+                return obj
+              }),
               isEmpty: res.data.length === 0,
               /// 显示的值
               values: res.data.map(obj => {

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, loginid, loginQuery, taAccount, userid } from '../../services/utils';
+import { accountid, getLoginCode, loginid, loginQuery, setLoginCode, taAccount, userid } from '../../services/utils';
 import { hideLoading, showLoading, showToast } from '../../utils/message/index';
 
 Page({
@@ -140,8 +140,12 @@ Page({
       title: '提示',
       message: '确定要退出系统吗？',
     }).then(() => {
+        /// 获取上次登录账号
+        const username = getLoginCode()
         /// 清楚所有的缓存数据
         wx.clearStorage()
+        /// 设置登录账号
+        setLoginCode(username)
         /// loding....
         showLoading(()=>{
           /// 登出

GuangZuan/miniprogram/pages/trade/index.ts

@@ -5,6 +5,7 @@ import { sendMsgToMQ } from "../../services/api/common/index";
 import { hideLoading, showLoading, showToast } from "../../utils/message/index";
 import { encryptBody } from "../../utils/websocket/crypto";
 import { appConfig } from "../../config/index";
+import { isnullstr } from "../../utils/util";
 
 Page({
 
@@ -275,7 +276,12 @@ Page({
           hideLoading(()=>{
             /// 数据赋值
             this.setData({ 
-              askOrders: res.data,
+              askOrders: res.data.map(itm => {
+                var obj = itm
+                obj.zscuttypedisplay = isnullstr(itm.zscuttypedisplay)
+                obj.zssize = itm.zssize.replace(',', '-')
+                return obj
+              }),
               isEmpty: res.data.length === 0
             })
           })

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

@@ -855,6 +855,8 @@ declare namespace GuangZuan {
     buyorsell: number
     /// 收藏状态 - 1:正常 2:失效
     favoritestatus: number
+    /// 图片信息
+    imagepath: string
     /// 商品编号
     goodsno: string
     /// 市场ID