fix

pages/login/login.vue

@@ -2,13 +2,8 @@
   <view class="main">
     <image src="@/static/image/logo.png" mode="scaleToFill" class="logo" />
     <view class="btn">
-      <u-button
-        v-if="isShow"
-        open-type="getPhoneNumber"
-        @getphonenumber="getPhoneNumber"
-        color="transparent"
-        text="点击登录"
-      ></u-button>
+      <u-button v-if="isShow" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" color="transparent"
+        text="点击登录"></u-button>
     </view>
     <!-- <view class="btn">
       <u-button v-if="isLogoutShow" @click="login" color="transparent">点击登录</u-button>
@@ -76,24 +71,29 @@ export default {
     },
     // info判断用户是401就让他获取openId
     async info() {
-      const res = await this.$api.mine.info();
-      if (res.status === 0) {
-        if (res.data.isNew) {
-          //登录未注册
-          uni.reLaunch({
-            url: "/pages/realName/realName"
-          });
-        } else {
-          //登录已注册
-          uni.reLaunch({
-            url: "/pages/home/index"
-          });
-        }
-      } else if (res.status === 401) {
+      if (!uni.getStorageSync("telNum")) {
         this.getOpenId();
       } else {
-        this.$common.msgToast(res.msg);
+        const res = await this.$api.mine.info();
+        if (res.status === 0) {
+          if (res.data.isNew) {
+            //登录未注册
+            uni.reLaunch({
+              url: "/pages/realName/realName"
+            });
+          } else {
+            //登录已注册
+            uni.reLaunch({
+              url: "/pages/home/index"
+            });
+          }
+        } else if (res.status === 401) {
+          this.getOpenId();
+        } else {
+          this.$common.msgToast(res.msg);
+        }
       }
+
     }
   },
   onLoad() {
@@ -106,20 +106,24 @@ export default {
 /deep/.u-button {
   background: red;
 }
+
 .main {
   background: url("https://cdns.fontree.cn/fonchain-main/prod/image/1381bd18-2f0c-49f1-84f6-d3eceb94f7a7/artwork/6ef00a09-f663-451d-ae0c-0d00cf4068c5.png");
   height: 100vh;
   display: flex;
   align-items: center;
   flex-direction: column;
+
   .logo {
     margin-top: 250rpx;
     width: 398rpx;
     height: 744rpx;
   }
+
   uni-button:after {
     border: 0px;
   }
+
   .btn {
     background: transparent;
     width: 200rpx;
@@ -132,10 +136,12 @@ export default {
     transition: all 1s;
     animation: jump 1s ease-in-out infinite alternate;
   }
+
   @keyframes jump {
     from {
       bottom: 16%;
     }
+
     to {
       bottom: 15%;
     }

pages/realName/realName.vue

@@ -38,8 +38,8 @@
                     </view>
                     <view class="card">
                         <view>
-                            <u-upload :fileList="fileList2" @afterRead="afterRead2" @delete="deletePic2" name="1" multiple
-                                :maxCount="1" :width="'270rpx'" :height="'158rpx'">
+                            <u-upload :fileList="fileList2" @afterRead="afterRead2" @delete="deletePic2" name="1"
+                                multiple :maxCount="1" :width="'270rpx'" :height="'158rpx'">
                                 <image src="@/static/image/card2.png" mode="scaleToFill"
                                     style="width: 270rpx;height: 158rpx;"></image>
                             </u-upload>
@@ -90,11 +90,11 @@
 
 <script>
 import http from "@/http/api";
-import {configFun} from "../../http/login";
+import { configFun } from "../../http/login";
 export default {
     data() {
         return {
-          needPersonSecret:false,
+            needPersonSecret: false,
             name: "",
             num: "",
             checked: [],
@@ -106,19 +106,24 @@ export default {
             // show:false
         };
     },
-     async onLoad() {
-      const res= await configFun()
-       if (res.code===200){
-         this.needPersonSecret=res.data.needPersonSecret
-       }
-     },
+    async onLoad() {
+        const res = await configFun()
+        if (res.code === 200) {
+            this.needPersonSecret = res.data.needPersonSecret
+        }
+    },
     async onShow() {
+        if (!uni.getStorageSync("telNum")) {
+            uni.navigateTo({
+                url: '/pages/login/login'
+            })
+        }
         this.checkFdd()
         if (uni.getStorageSync('tempVideoPath')) {
             const tempVideoPath = uni.getStorageSync('tempVideoPath');
             this.video = await this.uploadFilePromise(tempVideoPath)
             uni.removeStorageSync("tempVideoPath")
-            console.log('this.video', this.video,uni.getStorageSync('tempVideoPath'))
+            console.log('this.video', this.video, uni.getStorageSync('tempVideoPath'))
             // const data = {
             //     num: uni.getStorageSync("info").num || '',
             //     name: uni.getStorageSync("info").name || '',
@@ -129,10 +134,10 @@ export default {
             // uni.setStorageSync("info", data)
         }
     },
-    watch:{
-        isFddSuccess(newValue){
-            if(newValue){
-                console.log(9999999,newValue)
+    watch: {
+        isFddSuccess(newValue) {
+            if (newValue) {
+                console.log(9999999, newValue)
                 this.name = uni.getStorageSync("info").name || ''
                 this.num = uni.getStorageSync("info").num || ''
                 this.fileList = uni.getStorageSync("info").fileList || []
@@ -163,14 +168,14 @@ export default {
                 realIDImgA: this.fileList[0]?.url,
                 realIDImgB: this.fileList2[0]?.url
             })
-           const res1=await this.checkFdd()
-          if (!res1) return this.$common.msgToast("法大大验证未通过")
+            const res1 = await this.checkFdd()
+            if (!res1) return this.$common.msgToast("法大大验证未通过")
             if (!this.checked.length) return this.$common.msgToast("请阅读并勾选协议");
             if (!this.name) return this.$common.msgToast("请输入姓名");
             if (!this.num) return this.$common.msgToast("请输入身份证号");
             if (!this.fileList.length) return this.$common.msgToast("请上传身份证人面像");
             if (!this.fileList2.length) return this.$common.msgToast("请上传身份国徽面");
-          if (this.needPersonSecret&&!this.video) return this.$common.msgToast("请上传人脸识别视频");
+            if (this.needPersonSecret && !this.video) return this.$common.msgToast("请上传人脸识别视频");
             const res = await this.$api.login.register({
                 user: {
                     telNum: uni.getStorageSync("telNum"),

pages/register/register.vue

@@ -9,30 +9,14 @@
         <view class="info">
           <view class="item">
             <view class="name">手机号</view>
-            <u--input
-              placeholder="请输入手机号"
-              border="none"
-              v-model="phone"
-              @change="changePhone"
-              clearable
-              type="number"
-              @blur="checkPhone"
-              @confirm="checkPhone"
-            ></u--input>
+            <u--input placeholder="请输入手机号" border="none" v-model="phone" @change="changePhone" clearable type="number"
+              @blur="checkPhone" @confirm="checkPhone"></u--input>
           </view>
           <view class="item">
             <view class="name">确定手机号</view>
-            <u--input
-              placeholder="请输入手机号"
-              border="none"
-              v-model="determinePhone"
-              @change="changeDeterminePhone"
-              clearable
-              type="number"
-              @blur="checkPhone"
-              @confirm="checkPhone"
-            ></u--input>
-            <view class="right" v-show="isRight" :style="{background: !isTrue?'#76c458':'#FF0000'}">
+            <u--input placeholder="请输入手机号" border="none" v-model="determinePhone" @change="changeDeterminePhone" clearable
+              type="number" @blur="checkPhone" @confirm="checkPhone"></u--input>
+            <view class="right" v-show="isRight" :style="{ background: !isTrue ? '#76c458' : '#FF0000' }">
               <u-icon name="checkmark-circle" color="#fff" v-if="!isTrue"></u-icon>
               <u-icon name="close-circle" color="#fff" v-else></u-icon>
             </view>
@@ -99,6 +83,7 @@ export default {
 page {
   box-sizing: border-box;
 }
+
 .main {
   background: url("@/static/image/login-bg.png") no-repeat;
   box-sizing: border-box;
@@ -107,17 +92,22 @@ page {
   justify-content: center;
   align-items: center;
   height: 100vh;
+  overflow-y: auto;
+
+
   .logo {
     height: 200rpx;
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
+
     .img {
       width: 124rpx;
       height: 72rpx;
     }
   }
+
   .container {
     display: flex;
     justify-content: space-between;
@@ -129,13 +119,17 @@ page {
     background: #fff;
     border-radius: 40rpx 40rpx 0rpx 0rpx;
     padding: 62rpx 32rpx;
+    overflow-y: auto;
+
     .title {
       color: #626262;
       font-size: 40rpx;
       margin-left: 36rpx;
     }
+
     .info {
       margin-top: 90rpx;
+
       .item {
         box-sizing: border-box;
         background: #f8f8f8;
@@ -146,15 +140,18 @@ page {
         align-items: center;
         padding-left: 24rpx;
         margin-bottom: 20rpx;
+
         .name {
           width: 200rpx;
           height: 72rpx;
           line-height: 72rpx;
           border-right: 1rpx solid #d1d1d1;
         }
+
         /deep/ .u-input {
           margin-left: 40rpx;
         }
+
         .right {
           position: relative;
           width: 70rpx;

unpackage/dist/dev/mp-weixin/components/title-block/title-block.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/cameraContext/cameraContext.js

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/cameraContext/cameraContext"],{240:function(n,e,t){"use strict";(function(n,e){var o=t(4);t(26);o(t(25));var r=o(t(241));n.__webpack_require_UNI_MP_PLUGIN__=t,e(r.default)}).call(this,t(1)["default"],t(2)["createPage"])},241:function(n,e,t){"use strict";t.r(e);var o=t(242),r=t(244);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);t(246);var u,i=t(33),a=Object(i["default"])(r["default"],o["render"],o["staticRenderFns"],!1,null,"0c0dc048",null,!1,o["components"],u);a.options.__file="pages/cameraContext/cameraContext.vue",e["default"]=a.exports},242:function(n,e,t){"use strict";t.r(e);var o=t(243);t.d(e,"render",(function(){return o["render"]})),t.d(e,"staticRenderFns",(function(){return o["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return o["recyclableRender"]})),t.d(e,"components",(function(){return o["components"]}))},243:function(n,e,t){"use strict";var o;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return u})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return o}));try{o={uCountDown:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-count-down/u-count-down")]).then(t.bind(null,402))},uButton:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-button/u-button")]).then(t.bind(null,335))}}}catch(i){if(-1===i.message.indexOf("Cannot find module")||-1===i.message.indexOf(".vue"))throw i;console.error(i.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var r=function(){var n=this,e=n.$createElement;n._self._c},c=!1,u=[];r._withStripped=!0},244:function(n,e,t){"use strict";t.r(e);var o=t(245),r=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);e["default"]=r.a},245:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{isAnimate:!1,tempVideoPath:"",tips:"⚪录制",isEnd:!0}},onLoad:function(){this.ctx=n.createCameraContext(),this.tips="⚪录制"},methods:{startRecord:function(){var e=this;this.ctx.startRecord({success:function(t){e.isAnimate=!0,e.tips="⚪录制中",setTimeout((function(){e.ctx.stopRecord({success:function(t){console.log("自动停止录像",t),e.isAnimate=!1,e.$common.msgToast("录制完成"),e.tempVideoPath=t.tempVideoPath,e.tips="⚪录制完成",e.isEnd=!1,n.setStorageSync("tempVideoPath",t.tempVideoPath)}})}),5e3)}})},back:function(){n.navigateBack({delta:2})}}};e.default=t}).call(this,t(2)["default"])},246:function(n,e,t){"use strict";t.r(e);var o=t(247),r=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);e["default"]=r.a},247:function(n,e,t){}},[[240,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/cameraContext/cameraContext"],{240:function(e,n,t){"use strict";(function(e,n){var o=t(4);t(26);o(t(25));var r=o(t(241));e.__webpack_require_UNI_MP_PLUGIN__=t,n(r.default)}).call(this,t(1)["default"],t(2)["createPage"])},241:function(e,n,t){"use strict";t.r(n);var o=t(242),r=t(244);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);t(246);var u,a=t(33),i=Object(a["default"])(r["default"],o["render"],o["staticRenderFns"],!1,null,"0c0dc048",null,!1,o["components"],u);i.options.__file="pages/cameraContext/cameraContext.vue",n["default"]=i.exports},242:function(e,n,t){"use strict";t.r(n);var o=t(243);t.d(n,"render",(function(){return o["render"]})),t.d(n,"staticRenderFns",(function(){return o["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return o["recyclableRender"]})),t.d(n,"components",(function(){return o["components"]}))},243:function(e,n,t){"use strict";var o;t.r(n),t.d(n,"render",(function(){return r})),t.d(n,"staticRenderFns",(function(){return u})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return o}));try{o={uCountDown:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-count-down/u-count-down")]).then(t.bind(null,402))},uButton:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-button/u-button")]).then(t.bind(null,335))}}}catch(a){if(-1===a.message.indexOf("Cannot find module")||-1===a.message.indexOf(".vue"))throw a;console.error(a.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var r=function(){var e=this,n=e.$createElement;e._self._c},c=!1,u=[];r._withStripped=!0},244:function(e,n,t){"use strict";t.r(n);var o=t(245),r=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(c);n["default"]=r.a},245:function(e,n,t){"use strict";(function(e){var o=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r=o(t(63)),c=o(t(65)),u=t(35),a={data:function(){return{needPersonSecret:!1,isAnimate:!1,tempVideoPath:"",tips:"⚪录制",isEnd:!0}},onLoad:function(){var n=this;return(0,c.default)(r.default.mark((function t(){var o;return r.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,(0,u.configFun)();case 2:o=t.sent,200===o.code&&(n.needPersonSecret=o.data.needPersonSecret),n.ctx=e.createCameraContext(),n.tips="⚪录制";case 6:case"end":return t.stop()}}),t)})))()},methods:{startRecord:function(){var n=this;this.ctx.startRecord({success:function(t){n.isAnimate=!0,n.tips="⚪录制中",setTimeout((function(){n.ctx.stopRecord({success:function(t){console.log("自动停止录像",t),n.isAnimate=!1,n.$common.msgToast("录制完成"),n.tempVideoPath=t.tempVideoPath,n.tips="⚪录制完成",n.isEnd=!1,e.setStorageSync("tempVideoPath",t.tempVideoPath)}})}),5e3)}})},back:function(){e.navigateBack({delta:2})}}};n.default=a}).call(this,t(2)["default"])},246:function(e,n,t){"use strict";t.r(n);var o=t(247),r=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(c);n["default"]=r.a},247:function(e,n,t){}},[[240,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map

unpackage/dist/dev/mp-weixin/pages/cameraContext/cameraContext.wxml

@@ -1 +1 @@
-<view class="main data-v-0c0dc048"><view class="logo data-v-0c0dc048"><image class="img data-v-0c0dc048" src="/static/image/logo2.png" mode="scaleToFill"></image></view><view class="container data-v-0c0dc048"><view style="color:#626262;font-size:40rpx;" class="data-v-0c0dc048">人脸识别</view><camera style="width:600rpx;height:600rpx;" device-position="front" flash="off" binderror="error" mode="normal" data-ref="camera" class="data-v-0c0dc048 vue-ref"><cover-image style="width:600rpx;height:600rpx;" src="/static/image/camera.png" class="data-v-0c0dc048"></cover-image></camera><view class="time data-v-0c0dc048"><view class="dot data-v-0c0dc048"></view><block wx:if="{{isAnimate}}"><u-count-down vue-id="452b5caa-1" time="{{5*1000}}" format="ss" data-ref="countDown" class="data-v-0c0dc048 vue-ref" bind:__l="__l"></u-count-down></block></view><view style="width:400rpx;" class="data-v-0c0dc048"><u-button vue-id="452b5caa-2" text="{{tips}}" shape="circle" color="#76C458" disabled="{{isAnimate}}" data-event-opts="{{[['^click',[['startRecord']]]]}}" bind:click="__e" class="data-v-0c0dc048" bind:__l="__l"></u-button><view style="margin-top:20rpx;" class="data-v-0c0dc048"><u-button vue-id="452b5caa-3" text="确认" shape="circle" color="#76C458" disabled="{{isEnd||tips!=='⚪录制完成'}}" data-event-opts="{{[['^click',[['back']]]]}}" bind:click="__e" class="data-v-0c0dc048" bind:__l="__l"></u-button></view></view></view></view>
+<block wx:if="{{needPersonSecret}}"><view class="main data-v-0c0dc048"><view class="logo data-v-0c0dc048"><image class="img data-v-0c0dc048" src="/static/image/logo2.png" mode="scaleToFill"></image></view><view class="container data-v-0c0dc048"><view style="color:#626262;font-size:40rpx;" class="data-v-0c0dc048">人脸识别</view><camera style="width:600rpx;height:600rpx;" device-position="front" flash="off" binderror="error" mode="normal" data-ref="camera" class="data-v-0c0dc048 vue-ref"><cover-image style="width:600rpx;height:600rpx;" src="/static/image/camera.png" class="data-v-0c0dc048"></cover-image></camera><view class="time data-v-0c0dc048"><view class="dot data-v-0c0dc048"></view><block wx:if="{{isAnimate}}"><u-count-down vue-id="452b5caa-1" time="{{5*1000}}" format="ss" data-ref="countDown" class="data-v-0c0dc048 vue-ref" bind:__l="__l"></u-count-down></block></view><view style="width:400rpx;" class="data-v-0c0dc048"><u-button vue-id="452b5caa-2" text="{{tips}}" shape="circle" color="#76C458" disabled="{{isAnimate}}" data-event-opts="{{[['^click',[['startRecord']]]]}}" bind:click="__e" class="data-v-0c0dc048" bind:__l="__l"></u-button><view style="margin-top:20rpx;" class="data-v-0c0dc048"><u-button vue-id="452b5caa-3" text="确认" shape="circle" color="#76C458" disabled="{{isEnd||tips!=='⚪录制完成'}}" data-event-opts="{{[['^click',[['back']]]]}}" bind:click="__e" class="data-v-0c0dc048" bind:__l="__l"></u-button></view></view></view></view></block>

unpackage/dist/dev/mp-weixin/pages/consignment-painting/index.json

@@ -1,4 +1,5 @@
 {
+  "disableScroll": true,
   "navigationStyle": "custom",
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,

unpackage/dist/dev/mp-weixin/pages/consignment-painting/index.wxss

@@ -71,6 +71,116 @@ picker-view.data-v-06cb0d30 {
   background-size: cover;
   width: 100vw;
   height: 100vh;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+}
+.order-details .content-list.data-v-06cb0d30 {
+  top: 130rpx;
+  z-index: 999;
+  position: absolute;
+  width: 686rpx;
+  margin-top: 34rpx;
+  text-align: right;
+}
+.order-details .content-list .wrap1.data-v-06cb0d30 {
+  margin-bottom: 10rpx;
+  font-size: 24rpx;
+  color: #4e964d;
+}
+.order-details .content-list .wrap2.data-v-06cb0d30 {
+  box-sizing: border-box;
+  border-radius: 20rpx;
+  background-color: #fff;
+  padding-left: 18rpx;
+  padding-right: 32rpx;
+}
+.order-details .content-list .wrap2 .wrap2_2.data-v-06cb0d30 {
+  height: 60rpx;
+  position: relative;
+}
+.order-details .content-list .wrap2 .wrap2_2 .wrap2_2_2.data-v-06cb0d30 {
+  line-height: 60rpx;
+  color: #76c458;
+  font-size: 24rpx;
+}
+.order-details .content-list .wrap2 .wrap2_2 .wrap2_2_1.data-v-06cb0d30 {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+.order-details .content-list .wrap2 .wrap2_2 .wrap2_2_1 ._img.data-v-06cb0d30 {
+  width: 30rpx;
+  height: 16rpx;
+}
+.order-details .content-list .wrap2 .wrap2_1.data-v-06cb0d30 {
+  z-index: 999;
+  overflow-y: scroll;
+}
+.order-details .content-list .wrap2 .wrap2_1 .item.data-v-06cb0d30 {
+  height: 154rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-left: 10rpx;
+  padding-right: 10rpx;
+}
+.order-details .content-list .wrap2 .wrap2_1 .item.active.data-v-06cb0d30 {
+  background-color: #f5fbf2;
+}
+.order-details .content-list .wrap2 .wrap2_1 .item .item_5.data-v-06cb0d30 {
+  width: 134rpx;
+  color: #626262;
+  font-size: 24rpx;
+}
+.order-details .content-list .wrap2 .wrap2_1 .item .item_4.data-v-06cb0d30 {
+  margin-right: 28rpx;
+  width: 192rpx;
+  color: #626262;
+  font-size: 24rpx;
+}
+.order-details .content-list .wrap2 .wrap2_1 .item .item_3.data-v-06cb0d30 {
+  margin-right: 48rpx;
+  width: 78rpx;
+  color: #626262;
+  font-size: 24rpx;
+}
+.order-details .content-list .wrap2 .wrap2_1 .item .item_2.data-v-06cb0d30 {
+  margin-right: 24rpx;
+  width: 68rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.order-details .content-list .wrap2 .wrap2_1 .item .item_2 .item_2_2.data-v-06cb0d30 {
+  color: #939393;
+  font-size: 20rpx;
+}
+.order-details .content-list .wrap2 .wrap2_1 .item .item_2 .item_2_1.data-v-06cb0d30 {
+  background-color: #000;
+  width: 68rpx;
+  height: 68rpx;
+}
+.order-details .content-list .wrap2 .wrap2_1 .item .item_2 .item_2_1 ._img.data-v-06cb0d30 {
+  width: 100%;
+  height: 100%;
+}
+.order-details .content-list .wrap2 .wrap2_1 .item .item_1.data-v-06cb0d30 {
+  margin-right: 18rpx;
+  color: #58a66b;
+  font-size: 24rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 36rpx;
+  height: 36rpx;
+  border: 5rpx solid #76c458;
+  border-radius: 50%;
+  background: transparent;
 }
 .order-details > .content5.data-v-06cb0d30 {
   align-items: center;
@@ -82,6 +192,56 @@ picker-view.data-v-06cb0d30 {
   height: 172rpx;
   display: flex;
 }
+.order-details > .content5 .wrap4.data-v-06cb0d30 {
+  z-index: 999;
+  width: 100%;
+  background-color: #fff;
+  position: absolute;
+}
+.order-details > .content5 .wrap4 .item.data-v-06cb0d30 {
+  height: 152rpx;
+  display: flex;
+  align-items: center;
+}
+.order-details > .content5 .wrap4 .item .item_4.data-v-06cb0d30 {
+  margin-right: 64rpx;
+  margin-left: auto;
+  color: #76c458;
+  font-size: 24rpx;
+  font-weight: bold;
+}
+.order-details > .content5 .wrap4 .item .item_3.data-v-06cb0d30 {
+  width: 100rpx;
+  margin-left: 48rpx;
+  color: #626262;
+  font-size: 24rpx;
+}
+.order-details > .content5 .wrap4 .item .item_2.data-v-06cb0d30 {
+  width: 100rpx;
+  margin-left: 34rpx;
+  color: #626262;
+  font-size: 24rpx;
+}
+.order-details > .content5 .wrap4 .item .item_1.data-v-06cb0d30 {
+  margin-left: 56rpx;
+  color: #58a66b;
+  font-size: 24rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 36rpx;
+  height: 36rpx;
+  border: 5rpx solid #76c458;
+  border-radius: 50%;
+  background: transparent;
+}
+.order-details > .content5 .wrap3.data-v-06cb0d30 {
+  margin-left: 32rpx;
+}
+.order-details > .content5 .wrap3 ._img.data-v-06cb0d30 {
+  width: 30rpx;
+  height: 16rpx;
+}
 .order-details > .content5 .wrap2.data-v-06cb0d30 {
   border-radius: 40rpx;
   display: flex;
@@ -94,7 +254,7 @@ picker-view.data-v-06cb0d30 {
   background: #76C458;
 }
 .order-details > .content5 .wrap1.data-v-06cb0d30 {
-  margin-left: 58rpx;
+  margin-left: 18rpx;
   margin-right: 70rpx;
   display: flex;
   flex-direction: column;
@@ -314,20 +474,92 @@ picker-view.data-v-06cb0d30 {
   width: 48rpx;
   height: 48rpx;
 }
-.order-details > .content4.data-v-06cb0d30 {
+.order-details .content-center.data-v-06cb0d30 {
+  overflow-y: scroll;
+  margin-bottom: 180rpx;
+}
+.order-details .content-center .painting-name.data-v-06cb0d30 {
+  margin-top: 48rpx;
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+}
+.order-details .content-center .painting-name .wrap1.data-v-06cb0d30 {
+  color: black;
+  font-size: 28rpx;
+}
+.order-details .content-center .painting-name .wrap2.data-v-06cb0d30 {
+  font-size: 28rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #76c458;
+  border-radius: 40rpx;
+  background-color: #fff;
+  width: 148rpx;
+  height: 56rpx;
+  border: 1px solid #76c458;
+}
+.order-details .content-center > .content7.data-v-06cb0d30 {
+  margin: 0 auto;
+  background-color: #fff;
+  border-radius: 40rpx;
+  width: 228rpx;
+  height: 56rpx;
+  border: 3rpx solid #76c458;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.order-details .content-center > .content7 .wrap2.data-v-06cb0d30 {
+  color: #76c458;
+  font-size: 28rpx;
+}
+.order-details .content-center > .content7 .wrap1.data-v-06cb0d30 {
+  margin-right: 20rpx;
+  box-sizing: border-box;
+  width: 32rpx;
+  height: 32rpx;
+  border: 3rpx solid #76c458;
+  border-radius: 50%;
+  background: transparent;
+  position: relative;
+}
+.order-details .content-center > .content7 .wrap1 .horizontal.data-v-06cb0d30 {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  width: 18rpx;
+  height: 2rpx;
+  background-color: #76c458;
+}
+.order-details .content-center > .content7 .wrap1 .vertical.data-v-06cb0d30 {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  width: 2rpx;
+  height: 18rpx;
+  background-color: #76c458;
+}
+.order-details .content-center > .content4.data-v-06cb0d30 {
+  margin-bottom: 24rpx;
   margin-top: 60rpx;
 }
-.order-details > .content4 .wrap1.data-v-06cb0d30 {
+.order-details .content-center > .content4 .wrap1.data-v-06cb0d30 {
   border: 1rpx dashed #DFE9F0;
   background-color: #fff;
 }
-.order-details > .content4 .wrap1 .wrap1_1.data-v-06cb0d30 {
+.order-details .content-center > .content4 .wrap1 .wrap1_1.data-v-06cb0d30 {
   position: relative;
   height: 114rpx;
   display: flex;
   align-items: center;
 }
-.order-details > .content4 .wrap1 .wrap1_1 .wrap1_1_4.data-v-06cb0d30 {
+.order-details .content-center > .content4 .wrap1 .wrap1_1 .wrap1_1_4.data-v-06cb0d30 {
   left: 50%;
   -webkit-transform: translateX(-50%);
           transform: translateX(-50%);
@@ -337,45 +569,45 @@ picker-view.data-v-06cb0d30 {
   width: 636rpx;
   border-bottom: 0.5px solid #626262;
 }
-.order-details > .content4 .wrap1 .wrap1_1 .wrap1_1_5.data-v-06cb0d30 {
+.order-details .content-center > .content4 .wrap1 .wrap1_1 .wrap1_1_5.data-v-06cb0d30 {
   right: 42rpx;
   position: absolute;
 }
-.order-details > .content4 .wrap1 .wrap1_1 .wrap1_1_5 image.data-v-06cb0d30 {
+.order-details .content-center > .content4 .wrap1 .wrap1_1 .wrap1_1_5 image.data-v-06cb0d30 {
   width: 46.34rpx;
   height: 20rpx;
 }
-.order-details > .content4 .wrap1 .wrap1_1 .wrap1_1_2.data-v-06cb0d30 {
+.order-details .content-center > .content4 .wrap1 .wrap1_1 .wrap1_1_2.data-v-06cb0d30 {
   margin-right: 36rpx;
   width: 0;
   height: 66rpx;
   border-left: 0.5px solid #626262;
 }
-.order-details > .content4 .wrap1 .wrap1_1 .wrap1_1_1.data-v-06cb0d30 {
+.order-details .content-center > .content4 .wrap1 .wrap1_1 .wrap1_1_1.data-v-06cb0d30 {
   width: 210rpx;
   padding-left: 32rpx;
   color: #626262;
   font-size: 24rpx;
 }
-.order-details > .content3.data-v-06cb0d30 {
+.order-details .content-center > .content3.data-v-06cb0d30 {
   margin-top: 60rpx;
 }
-.order-details > .content3 .prompt.data-v-06cb0d30 {
+.order-details .content-center > .content3 .prompt.data-v-06cb0d30 {
   color: #4E964D;
   font-size: 16rpx;
   margin-bottom: 4rpx;
 }
-.order-details > .content3 .wrap1.data-v-06cb0d30 {
+.order-details .content-center > .content3 .wrap1.data-v-06cb0d30 {
   border: 1rpx dashed #DFE9F0;
   background-color: #fff;
 }
-.order-details > .content3 .wrap1 .wrap1_1.data-v-06cb0d30 {
+.order-details .content-center > .content3 .wrap1 .wrap1_1.data-v-06cb0d30 {
   position: relative;
   height: 114rpx;
   display: flex;
   align-items: center;
 }
-.order-details > .content3 .wrap1 .wrap1_1 .wrap1_1_4.data-v-06cb0d30 {
+.order-details .content-center > .content3 .wrap1 .wrap1_1 .wrap1_1_4.data-v-06cb0d30 {
   left: 50%;
   -webkit-transform: translateX(-50%);
           transform: translateX(-50%);
@@ -385,24 +617,23 @@ picker-view.data-v-06cb0d30 {
   width: 636rpx;
   border-bottom: 0.5px solid #626262;
 }
-.order-details > .content3 .wrap1 .wrap1_1 .wrap1_1_2.data-v-06cb0d30 {
+.order-details .content-center > .content3 .wrap1 .wrap1_1 .wrap1_1_2.data-v-06cb0d30 {
   margin-right: 36rpx;
   width: 0;
   height: 66rpx;
   border-left: 0.5px solid #626262;
 }
-.order-details > .content3 .wrap1 .wrap1_1 .wrap1_1_1.data-v-06cb0d30 {
+.order-details .content-center > .content3 .wrap1 .wrap1_1 .wrap1_1_1.data-v-06cb0d30 {
   width: 210rpx;
   padding-left: 32rpx;
   color: #626262;
   font-size: 24rpx;
 }
-.order-details > .content2.data-v-06cb0d30 {
-  margin-top: 42rpx;
+.order-details .content-center > .content2.data-v-06cb0d30 {
   display: flex;
   justify-content: center;
 }
-.order-details > .content2 image.data-v-06cb0d30 {
+.order-details .content-center > .content2 image.data-v-06cb0d30 {
   width: 404rpx;
   height: 306rpx;
 }

unpackage/dist/dev/mp-weixin/pages/contract/index.js

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/contract/index"],{256:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(26);r(n(25));var o=r(n(257));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},257:function(e,t,n){"use strict";n.r(t);var r=n(258),o=n(260);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(263);var c,i=n(33),u=Object(i["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"3ea6d064",null,!1,r["components"],c);u.options.__file="pages/contract/index.vue",t["default"]=u.exports},258:function(e,t,n){"use strict";n.r(t);var r=n(259);n.d(t,"render",(function(){return r["render"]})),n.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),n.d(t,"components",(function(){return r["components"]}))},259:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return c})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return r}));try{r={titleBlock:function(){return n.e("components/title-block/title-block").then(n.bind(null,386))}}}catch(i){if(-1===i.message.indexOf("Cannot find module")||-1===i.message.indexOf(".vue"))throw i;console.error(i.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,t=e.$createElement,n=(e._self._c,e.__map(e.mainList,(function(t,n){var r=e.__get_orig(t),o=t.contractId.length,a=o>10?t.contractId.slice(0,10):null;return{$orig:r,g0:o,g1:a}})));e.$mp.data=Object.assign({},{$root:{l0:n}})},a=!1,c=[];o._withStripped=!0},260:function(e,t,n){"use strict";n.r(t);var r=n(261),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},261:function(e,t,n){"use strict";(function(e){var r=n(4);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=r(n(63)),a=r(n(5)),c=r(n(65)),i=n(262),u=function(){Promise.all([n.e("common/vendor"),n.e("components/uiq-tabbar/uiq-tabbar")]).then(function(){return resolve(n(419))}.bind(null,n)).catch(n.oe)},s={name:"index",components:{tabbar:u},data:function(){return{show:!1,page:1,pageSize:999,mainList:[],elementBottom:""}},onShow:function(){this.getData()},mounted:function(){this.getDistanceFromTopToPageBottom(".content3")},methods:{previewContract:function(t){return(0,c.default)(o.default.mark((function n(){var r,a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return r={ID:t.ID},n.next=3,(0,i.postDataByParams)("/api/warehouse/fdd/pdf/url",r);case 3:a=n.sent,200===a.code&&(e.setStorageSync("jumpUrl",a.data.jumpUrl),e.navigateTo({url:"/pages/signwebview/index"}));case 5:case"end":return n.stop()}}),n)})))()},getDistanceFromTopToPageBottom:function(t){var n=this;return(0,c.default)(o.default.mark((function r(){var c,i,u,s,d,l;return o.default.wrap((function(r){while(1)switch(r.prev=r.next){case 0:return r.next=2,e.getSystemInfo();case 2:return c=r.sent,i=c.windowHeight,u=c.windowWidth,r.next=7,new Promise((function(n){return e.createSelectorQuery().select(t).boundingClientRect().exec(n)}));case 7:s=r.sent,d=(0,a.default)(s,1),l=d[0].top,n.elementBottom=(i-l)/u*750-175;case 11:case"end":return r.stop()}}),r)})))()},loadMore:function(){},getData:function(){var t=this;return(0,c.default)(o.default.mark((function n(){var r,a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return r={page:t.page,pageSize:t.pageSize},n.next=3,(0,i.postDataByParams)("/api/warehouse/list",r);case 3:a=n.sent,200===a.code?t.mainList=a.data.data:e.showToast({title:a.msg,icon:"none"});case 5:case"end":return n.stop()}}),n)})))()}}};t.default=s}).call(this,n(2)["default"])},263:function(e,t,n){"use strict";n.r(t);var r=n(264),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},264:function(e,t,n){}},[[256,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/contract/index"],{256:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(26);r(n(25));var o=r(n(257));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},257:function(e,t,n){"use strict";n.r(t);var r=n(258),o=n(260);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(263);var c,u=n(33),i=Object(u["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"3ea6d064",null,!1,r["components"],c);i.options.__file="pages/contract/index.vue",t["default"]=i.exports},258:function(e,t,n){"use strict";n.r(t);var r=n(259);n.d(t,"render",(function(){return r["render"]})),n.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),n.d(t,"components",(function(){return r["components"]}))},259:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return c})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return r}));try{r={titleBlock:function(){return n.e("components/title-block/title-block").then(n.bind(null,386))}}}catch(u){if(-1===u.message.indexOf("Cannot find module")||-1===u.message.indexOf(".vue"))throw u;console.error(u.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,t=e.$createElement;e._self._c},a=!1,c=[];o._withStripped=!0},260:function(e,t,n){"use strict";n.r(t);var r=n(261),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},261:function(e,t,n){"use strict";(function(e){var r=n(4);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=r(n(63)),a=r(n(5)),c=r(n(65)),u=n(262),i=function(){Promise.all([n.e("common/vendor"),n.e("components/uiq-tabbar/uiq-tabbar")]).then(function(){return resolve(n(419))}.bind(null,n)).catch(n.oe)},s={name:"index",components:{tabbar:i},data:function(){return{show:!1,page:1,pageSize:999,mainList:[],elementBottom:""}},onShow:function(){this.getData()},mounted:function(){this.getDistanceFromTopToPageBottom(".content3")},methods:{previewContract:function(t){return(0,c.default)(o.default.mark((function n(){var r,a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return r={ID:t.ID},n.next=3,(0,u.postDataByParams)("/api/warehouse/fdd/pdf/url",r);case 3:a=n.sent,200===a.code&&(e.setStorageSync("jumpUrl",a.data.jumpUrl),e.navigateTo({url:"/pages/signwebview/index"}));case 5:case"end":return n.stop()}}),n)})))()},getDistanceFromTopToPageBottom:function(t){var n=this;return(0,c.default)(o.default.mark((function r(){var c,u,i,s,d,l;return o.default.wrap((function(r){while(1)switch(r.prev=r.next){case 0:return r.next=2,e.getSystemInfo();case 2:return c=r.sent,u=c.windowHeight,i=c.windowWidth,r.next=7,new Promise((function(n){return e.createSelectorQuery().select(t).boundingClientRect().exec(n)}));case 7:s=r.sent,d=(0,a.default)(s,1),l=d[0].top,n.elementBottom=(u-l)/i*750-175;case 11:case"end":return r.stop()}}),r)})))()},loadMore:function(){},getData:function(){var t=this;return(0,c.default)(o.default.mark((function n(){var r,a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return r={page:t.page,pageSize:t.pageSize},n.next=3,(0,u.postDataByParams)("/api/warehouse/list",r);case 3:a=n.sent,200===a.code?t.mainList=a.data.data:e.showToast({title:a.msg,icon:"none"});case 5:case"end":return n.stop()}}),n)})))()}}};t.default=s}).call(this,n(2)["default"])},263:function(e,t,n){"use strict";n.r(t);var r=n(264),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},264:function(e,t,n){}},[[256,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/contract/index.js.map

unpackage/dist/dev/mp-weixin/pages/contract/index.wxml

@@ -1 +1 @@
-<view class="contract _div data-v-3ea6d064"><title-block vue-id="34e6e2f8-1" title="待签署合同" class="data-v-3ea6d064" bind:__l="__l"></title-block><view class="content2 _div data-v-3ea6d064"><view class="wrap1 _div data-v-3ea6d064">合同名称</view><view class="wrap2 _div data-v-3ea6d064">合同编号</view><view class="wrap3 _div data-v-3ea6d064">签署日期</view></view><view class="content3 _div data-v-3ea6d064"><scroll-view style="{{'height:'+(elementBottom+'rpx')+';'}}" scroll-y="{{true}}" data-event-opts="{{[['scrolltolower',[['loadMore',['$event']]]]]}}" bindscrolltolower="__e" class="data-v-3ea6d064"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['previewContract',['$0'],[[['mainList','',index]]]]]]]}}" class="wrap1 _div data-v-3ea6d064" bindtap="__e"><view class="wrap1_1 _div data-v-3ea6d064">{{item.$orig.contractTile}}</view><view class="wrap1_2 _div data-v-3ea6d064">{{''+(item.g0>10?item.g1+'...':item.$orig.contractId)+''}}</view><view class="wrap1_3 _div data-v-3ea6d064"><view class="wrap1_3_1 _div data-v-3ea6d064">{{item.$orig.signDate}}</view></view></view></block></scroll-view></view><tabbar vue-id="34e6e2f8-2" current="{{2}}" class="data-v-3ea6d064" bind:__l="__l"></tabbar></view>
+<view class="contract _div data-v-3ea6d064"><title-block vue-id="34e6e2f8-1" title="已签署合同" class="data-v-3ea6d064" bind:__l="__l"></title-block><view class="content2 _div data-v-3ea6d064"><view class="wrap1 _div data-v-3ea6d064">合同名称</view><view class="wrap3 _div data-v-3ea6d064">签署日期</view></view><view class="content3 _div data-v-3ea6d064"><scroll-view style="{{'height:'+(elementBottom+'rpx')+';'}}" scroll-y="{{true}}" data-event-opts="{{[['scrolltolower',[['loadMore',['$event']]]]]}}" bindscrolltolower="__e" class="data-v-3ea6d064"><block wx:for="{{mainList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['previewContract',['$0'],[[['mainList','',index]]]]]]]}}" class="wrap1 _div data-v-3ea6d064" bindtap="__e"><view class="wrap1_1 _div data-v-3ea6d064">{{item.artworkNum}}</view><view class="wrap1_3 _div data-v-3ea6d064"><view class="wrap1_3_1 _div data-v-3ea6d064">{{item.signDate}}</view></view></view></block></scroll-view></view><tabbar vue-id="34e6e2f8-2" current="{{2}}" class="data-v-3ea6d064" bind:__l="__l"></tabbar></view>

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/login/login"],{201:function(e,n,t){"use strict";(function(e,n){var r=t(4);t(26);r(t(25));var o=r(t(202));e.__webpack_require_UNI_MP_PLUGIN__=t,n(o.default)}).call(this,t(1)["default"],t(2)["createPage"])},202:function(e,n,t){"use strict";t.r(n);var r=t(203),o=t(205);for(var a in o)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(a);t(207);var u,c=t(33),s=Object(c["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"b237504c",null,!1,r["components"],u);s.options.__file="pages/login/login.vue",n["default"]=s.exports},203:function(e,n,t){"use strict";t.r(n);var r=t(204);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},204:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return o})),t.d(n,"staticRenderFns",(function(){return u})),t.d(n,"recyclableRender",(function(){return a})),t.d(n,"components",(function(){return r}));try{r={uButton:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-button/u-button")]).then(t.bind(null,335))}}}catch(c){if(-1===c.message.indexOf("Cannot find module")||-1===c.message.indexOf(".vue"))throw c;console.error(c.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,n=e.$createElement;e._self._c},a=!1,u=[];o._withStripped=!0},205:function(e,n,t){"use strict";t.r(n);var r=t(206),o=t.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);n["default"]=o.a},206:function(e,n,t){"use strict";(function(e){var r=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=r(t(63)),a=r(t(65)),u={data:function(){return{code:"",openId:"",isShow:!1,isNew:!1}},methods:{getPhoneNumber:function(n){var t=this;return(0,a.default)(o.default.mark((function r(){var a;return o.default.wrap((function(r){while(1)switch(r.prev=r.next){case 0:if("getPhoneNumber:ok"!=n.detail.errMsg){r.next=7;break}return r.next=3,t.$api.login.getTel({code:n.detail.code});case 3:a=r.sent,0==a.status?(e.setStorageSync("telNum",a.data.telNum),console.log(1231111111,t.isNew),t.isNew?e.reLaunch({url:"/pages/realName/realName"}):e.reLaunch({url:"/pages/home/index"})):t.$common.msgToast(a.msg),r.next=8;break;case 7:t.$common.msgToast("请不要拒绝哟~重新点击登录");case 8:case"end":return r.stop()}}),r)})))()},getOpenId:function(){var n=this;return(0,a.default)(o.default.mark((function t(){return o.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:e.login({provider:"weixin",success:function(){var t=(0,a.default)(o.default.mark((function t(r){var a;return o.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return console.log("res.code",r.code),n.code=r.code,t.next=4,n.$api.login.login({code:r.code});case 4:a=t.sent,0==a.status?(a.data.accountInfo.isNew?(n.isShow=!0,n.isNew=a.data.accountInfo.isNew):e.reLaunch({url:"/pages/home/index"}),e.setStorageSync("token",a.data.token)):n.$common.msgToast(a.msg);case 6:case"end":return t.stop()}}),t)})));function r(e){return t.apply(this,arguments)}return r}()});case 1:case"end":return t.stop()}}),t)})))()},info:function(){var n=this;return(0,a.default)(o.default.mark((function t(){var r;return o.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,n.$api.mine.info();case 2:r=t.sent,0===r.status?r.data.isNew?e.reLaunch({url:"/pages/realName/realName"}):e.reLaunch({url:"/pages/home/index"}):401===r.status?n.getOpenId():n.$common.msgToast(r.msg);case 4:case"end":return t.stop()}}),t)})))()}},onLoad:function(){this.info()}};n.default=u}).call(this,t(2)["default"])},207:function(e,n,t){"use strict";t.r(n);var r=t(208),o=t.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);n["default"]=o.a},208:function(e,n,t){}},[[201,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/login/login"],{201:function(e,n,t){"use strict";(function(e,n){var r=t(4);t(26);r(t(25));var o=r(t(202));e.__webpack_require_UNI_MP_PLUGIN__=t,n(o.default)}).call(this,t(1)["default"],t(2)["createPage"])},202:function(e,n,t){"use strict";t.r(n);var r=t(203),o=t(205);for(var a in o)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(a);t(207);var u,c=t(33),s=Object(c["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"b237504c",null,!1,r["components"],u);s.options.__file="pages/login/login.vue",n["default"]=s.exports},203:function(e,n,t){"use strict";t.r(n);var r=t(204);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},204:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return o})),t.d(n,"staticRenderFns",(function(){return u})),t.d(n,"recyclableRender",(function(){return a})),t.d(n,"components",(function(){return r}));try{r={uButton:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-button/u-button")]).then(t.bind(null,335))}}}catch(c){if(-1===c.message.indexOf("Cannot find module")||-1===c.message.indexOf(".vue"))throw c;console.error(c.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,n=e.$createElement;e._self._c},a=!1,u=[];o._withStripped=!0},205:function(e,n,t){"use strict";t.r(n);var r=t(206),o=t.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);n["default"]=o.a},206:function(e,n,t){"use strict";(function(e){var r=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=r(t(63)),a=r(t(65)),u={data:function(){return{code:"",openId:"",isShow:!1,isNew:!1}},methods:{getPhoneNumber:function(n){var t=this;return(0,a.default)(o.default.mark((function r(){var a;return o.default.wrap((function(r){while(1)switch(r.prev=r.next){case 0:if("getPhoneNumber:ok"!=n.detail.errMsg){r.next=7;break}return r.next=3,t.$api.login.getTel({code:n.detail.code});case 3:a=r.sent,0==a.status?(e.setStorageSync("telNum",a.data.telNum),console.log(1231111111,t.isNew),t.isNew?e.reLaunch({url:"/pages/realName/realName"}):e.reLaunch({url:"/pages/home/index"})):t.$common.msgToast(a.msg),r.next=8;break;case 7:t.$common.msgToast("请不要拒绝哟~重新点击登录");case 8:case"end":return r.stop()}}),r)})))()},getOpenId:function(){var n=this;return(0,a.default)(o.default.mark((function t(){return o.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:e.login({provider:"weixin",success:function(){var t=(0,a.default)(o.default.mark((function t(r){var a;return o.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return console.log("res.code",r.code),n.code=r.code,t.next=4,n.$api.login.login({code:r.code});case 4:a=t.sent,0==a.status?(a.data.accountInfo.isNew?(n.isShow=!0,n.isNew=a.data.accountInfo.isNew):e.reLaunch({url:"/pages/home/index"}),e.setStorageSync("token",a.data.token)):n.$common.msgToast(a.msg);case 6:case"end":return t.stop()}}),t)})));function r(e){return t.apply(this,arguments)}return r}()});case 1:case"end":return t.stop()}}),t)})))()},info:function(){var n=this;return(0,a.default)(o.default.mark((function t(){var r;return o.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:if(e.getStorageSync("telNum")){t.next=4;break}n.getOpenId(),t.next=8;break;case 4:return t.next=6,n.$api.mine.info();case 6:r=t.sent,0===r.status?r.data.isNew?e.reLaunch({url:"/pages/realName/realName"}):e.reLaunch({url:"/pages/home/index"}):401===r.status?n.getOpenId():n.$common.msgToast(r.msg);case 8:case"end":return t.stop()}}),t)})))()}},onLoad:function(){this.info()}};n.default=u}).call(this,t(2)["default"])},207:function(e,n,t){"use strict";t.r(n);var r=t(208),o=t.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);n["default"]=o.a},208:function(e,n,t){}},[[201,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/login/login.js.map

unpackage/dist/dev/mp-weixin/pages/order-goods/index.wxss

@@ -104,16 +104,35 @@
 .order-goods .content3 .wrap1 .wrap1_3.status4 .wrap1_3_3_1.data-v-c0c42e9e {
   color: #FF4848;
 }
+.order-goods .content3 .wrap1 .wrap1_3 .wrap1_3_4.data-v-c0c42e9e {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 8rpx;
+  color: #fff;
+  width: 110rpx;
+  height: 35rpx;
+  background-color: #000;
+  left: 20rpx;
+  position: absolute;
+  bottom: 16rpx;
+  font-size: 18rpx;
+}
 .order-goods .content3 .wrap1 .wrap1_3 .wrap1_3_2.data-v-c0c42e9e {
   display: flex;
   flex-direction: column;
-  left: 20rpx;
+  left: 50%;
+  -webkit-transform: translateX(-50%);
+          transform: translateX(-50%);
   position: absolute;
   bottom: 60rpx;
+  min-width: -webkit-fit-content;
+  min-width: fit-content;
 }
 .order-goods .content3 .wrap1 .wrap1_3 .wrap1_3_2 .wrap1_3_2_1.data-v-c0c42e9e {
+  white-space: nowrap;
   color: #fff;
-  font-size: 16rpx;
+  font-size: 24rpx;
 }
 .order-goods .content3 .wrap1 .wrap1_3 .wrap1_3_2 .wrap1_3_2_2.data-v-c0c42e9e {
   color: #fff;

unpackage/dist/dev/mp-weixin/pages/order-goods/order-details.js

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/order-goods/order-details"],{287:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(26);r(n(25));var o=r(n(288));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},288:function(e,t,n){"use strict";n.r(t);var r=n(289),o=n(291);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(293);var c,u=n(33),i=Object(u["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"725951bc",null,!1,r["components"],c);i.options.__file="pages/order-goods/order-details.vue",t["default"]=i.exports},289:function(e,t,n){"use strict";n.r(t);var r=n(290);n.d(t,"render",(function(){return r["render"]})),n.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),n.d(t,"components",(function(){return r["components"]}))},290:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return c})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return r}));try{r={titleBlock:function(){return n.e("components/title-block/title-block").then(n.bind(null,386))}}}catch(u){if(-1===u.message.indexOf("Cannot find module")||-1===u.message.indexOf(".vue"))throw u;console.error(u.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,t=e.$createElement,n=(e._self._c,e.statusValue.find((function(t){return t.value===e.info.artworkStatus}))),r=e.statusValue.find((function(t){return t.value===e.info.artworkStatus})),o=1!==e.info.artworkStatus?e.info.startAt.replaceAll("-",".")||"":null,a=1!==e.info.artworkStatus?e.info.endAt.replaceAll("-",".")||"":null;e.$mp.data=Object.assign({},{$root:{g0:n,g1:r,g2:o,g3:a}})},a=!1,c=[];o._withStripped=!0},291:function(e,t,n){"use strict";n.r(t);var r=n(292),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},292:function(e,t,n){"use strict";(function(e){var r=n(4);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=r(n(63)),a=r(n(65)),c=n(262),u={name:"order-details",data:function(){return{distance:"",ID:"",info:{},statusValue:[{label:"全部状态",value:0},{label:"待入库",value:1,style:"color: #FFBA00;font-size: 24rpx"},{label:"已入库",value:2,style:"color: #76C458;font-size: 24rpx"},{label:"即将到期",value:3,style:"color: #FF4848;font-size: 24rpx"},{label:"延期未补款",value:4,style:"color: #FF4848;font-size: 24rpx"},{label:"已取出",value:5},{label:"延期已补款",value:7}]}},computed:{daysRemainingStyle:function(){switch(this.info.artworkStatus){case 1:case 2:case 3:case 5:return"color: #939393;font-size: 24rpx;";case 4:return"color: #FF4848;font-size: 24rpx;"}}},mounted:function(){var t=this;this.$mp.query.ID&&(this.ID=this.$mp.query.ID),this.getData(),e.createSelectorQuery().select(".title-block").boundingClientRect((function(n){var r=e.getSystemInfoSync(),o=r.windowHeight-n.bottom;t.distance=o})).exec()},methods:{back:function(){e.navigateBack()},getData:function(){var t=this;return(0,a.default)(o.default.mark((function n(){var r;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,(0,c.postDataByParams)("/api/warehouse/detail",{ID:Number(t.ID)});case 2:r=n.sent,200===r.code?t.info=r.data:e.showToast({title:r.msg,icon:"none"}),console.log(r,"res");case 5:case"end":return n.stop()}}),n)})))()}}};t.default=u}).call(this,n(2)["default"])},293:function(e,t,n){"use strict";n.r(t);var r=n(294),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},294:function(e,t,n){}},[[287,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/order-goods/order-details"],{287:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(26);r(n(25));var o=r(n(288));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},288:function(e,t,n){"use strict";n.r(t);var r=n(289),o=n(291);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(293);var c,u=n(33),i=Object(u["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"725951bc",null,!1,r["components"],c);i.options.__file="pages/order-goods/order-details.vue",t["default"]=i.exports},289:function(e,t,n){"use strict";n.r(t);var r=n(290);n.d(t,"render",(function(){return r["render"]})),n.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),n.d(t,"components",(function(){return r["components"]}))},290:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return c})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return r}));try{r={titleBlock:function(){return n.e("components/title-block/title-block").then(n.bind(null,386))}}}catch(u){if(-1===u.message.indexOf("Cannot find module")||-1===u.message.indexOf(".vue"))throw u;console.error(u.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,t=e.$createElement,n=(e._self._c,e.statusValue.find((function(t){return t.value===e.info.artworkStatus}))),r=e.statusValue.find((function(t){return t.value===e.info.artworkStatus})),o=1!==e.info.artworkStatus?e.info.startAt.replaceAll("-",".")||"":null,a=1!==e.info.artworkStatus?e.info.endAt.replaceAll("-",".")||"":null;e.$mp.data=Object.assign({},{$root:{g0:n,g1:r,g2:o,g3:a}})},a=!1,c=[];o._withStripped=!0},291:function(e,t,n){"use strict";n.r(t);var r=n(292),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},292:function(e,t,n){"use strict";(function(e){var r=n(4);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=r(n(63)),a=r(n(65)),c=n(262),u={name:"order-details",data:function(){return{distance:"",ID:"",info:{},statusValue:[{label:"全部状态",value:0},{label:"待入库",value:1,style:"color: #FFBA00;font-size: 24rpx"},{label:"已入库",value:2,style:"color: #76C458;font-size: 24rpx"},{label:"即将到期",value:3,style:"color: #FF4848;font-size: 24rpx"},{label:"延期未补款",value:4,style:"color: #FF4848;font-size: 24rpx"},{label:"已取出",value:5,style:"font-size: 24rpx"},{label:"延期已补款",value:7}]}},computed:{daysRemainingStyle:function(){switch(this.info.artworkStatus){case 1:case 2:case 3:case 5:return"color: #939393;font-size: 24rpx;";case 4:return"color: #FF4848;font-size: 24rpx;"}}},mounted:function(){var t=this;this.$mp.query.ID&&(this.ID=this.$mp.query.ID),this.getData(),e.createSelectorQuery().select(".title-block").boundingClientRect((function(n){var r=e.getSystemInfoSync(),o=r.windowHeight-n.bottom;t.distance=o})).exec()},methods:{back:function(){e.navigateBack()},getData:function(){var t=this;return(0,a.default)(o.default.mark((function n(){var r;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,(0,c.postDataByParams)("/api/warehouse/detail",{ID:Number(t.ID)});case 2:r=n.sent,200===r.code?t.info=r.data:e.showToast({title:r.msg,icon:"none"}),console.log(r,"res");case 5:case"end":return n.stop()}}),n)})))()}}};t.default=u}).call(this,n(2)["default"])},293:function(e,t,n){"use strict";n.r(t);var r=n(294),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},294:function(e,t,n){}},[[287,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/order-goods/order-details.js.map

unpackage/dist/dev/mp-weixin/pages/register/register.wxss

@@ -35,6 +35,7 @@ page.data-v-891c2434 {
   justify-content: center;
   align-items: center;
   height: 100vh;
+  overflow-y: auto;
 }
 .main .logo.data-v-891c2434 {
   height: 200rpx;
@@ -58,6 +59,7 @@ page.data-v-891c2434 {
   background: #fff;
   border-radius: 40rpx 40rpx 0rpx 0rpx;
   padding: 62rpx 32rpx;
+  overflow-y: auto;
 }
 .main .container .title.data-v-891c2434 {
   color: #626262;

unpackage/dist/dev/mp-weixin/uview-ui/components/u-action-sheet/u-action-sheet.json

@@ -1,10 +1,10 @@
 {
+  "component": true,
   "usingComponents": {
     "u-popup": "/uview-ui/components/u-popup/u-popup",
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-line": "/uview-ui/components/u-line/u-line",
     "u-loading-icon": "/uview-ui/components/u-loading-icon/u-loading-icon",
     "u-gap": "/uview-ui/components/u-gap/u-gap"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-loading-icon": "/uview-ui/components/u-loading-icon/u-loading-icon",
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-count-down/u-count-down.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-datetime-picker/u-datetime-picker.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-picker": "/uview-ui/components/u-picker/u-picker"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-divider/u-divider.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-line": "/uview-ui/components/u-line/u-line"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-page/u-loading-page.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-transition": "/uview-ui/components/u-transition/u-transition",
     "u-loading-icon": "/uview-ui/components/u-loading-icon/u-loading-icon"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.json

@@ -1,10 +1,10 @@
 {
+  "component": true,
   "usingComponents": {
     "u-overlay": "/uview-ui/components/u-overlay/u-overlay",
     "u-transition": "/uview-ui/components/u-transition/u-transition",
     "u-status-bar": "/uview-ui/components/u-status-bar/u-status-bar",
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-safe-bottom": "/uview-ui/components/u-safe-bottom/u-safe-bottom"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-upload/u-upload.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-loading-icon": "/uview-ui/components/u-loading-icon/u-loading-icon"
-  },
-  "component": true
+  }
 }