push

pages/register/register.vue

@@ -9,29 +9,13 @@
         <view class="info">
           <view class="item">
             <view class="name">手机号</view>
-            <u--input
+            <u--input placeholder="请输入手机号" border="none" v-model="phone" @change="changePhone" clearable type="number"
-              placeholder="请输入手机号"
+              @blur="checkPhone" @confirm="checkPhone"></u--input>
-              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
+            <u--input placeholder="请输入手机号" border="none" v-model="determinePhone" @change="changeDeterminePhone" clearable
-              placeholder="请输入手机号"
+              type="number" @blur="checkPhone" @confirm="checkPhone"></u--input>
-              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>
@@ -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/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/order-goods/index.wxss

@@ -104,12 +104,30 @@
 .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 {
   color: #fff;

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
 }