Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

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

ghsApp/dist/build/mp-weixin/components/app-date-picker.json

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

ghsApp/dist/build/mp-weixin/components/app-swiper.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/app-swiper"],{"150c":function(t,n,e){"use strict";e.r(n);var u=e("d5e8"),i=e("26d5");for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);e("9444");var r,o=e("0095"),c=Object(o["a"])(i["default"],u["b"],u["c"],!1,null,"93d0fdca",null,!1,u["a"],r);n["default"]=c.exports},"26d5":function(t,n,e){"use strict";e.r(n);var u=e("f978"),i=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);n["default"]=i.a},9444:function(t,n,e){"use strict";var u=e("db71"),i=e.n(u);i.a},d5e8:function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return u}));var i=function(){var t=this,n=t.$createElement;t._self._c},a=[]},db71:function(t,n,e){},f978:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=function(){e.e("components/module/app-tag").then(function(){return resolve(e("1a62"))}.bind(null,e)).catch(e.oe)},i={name:"app-swiper",components:{AppTag:u},props:{list:{type:Array,default:function(){return[]}},tagShow:{type:Boolean,default:!1},autoplay:{type:Boolean,default:!0},width:{type:Object,default:function(){return{type:"string",val:"100%"}}},height:{type:Object,default:function(){return{type:"number",val:480}}}},data:function(){return{index:0}},computed:{widthFn:function(){return"number"==this.width.type?t.upx2px(this.width.val)+"px":this.width.val},heightFn:function(){return"number"==this.height.type?t.upx2px(this.height.val)+"px":this.height.val}},methods:{bannerChange:function(t){this.index=t.detail.current},detail:function(t){this.$emit("detail",t)}}};n.default=i}).call(this,e("f3be")["default"])}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/app-swiper"],{"150c":function(t,n,e){"use strict";e.r(n);var u=e("549d"),i=e("26d5");for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);e("5d6a");var r,c=e("0095"),o=Object(c["a"])(i["default"],u["b"],u["c"],!1,null,"6b9dc305",null,!1,u["a"],r);n["default"]=o.exports},"26d5":function(t,n,e){"use strict";e.r(n);var u=e("f978"),i=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);n["default"]=i.a},"3b3c":function(t,n,e){},"549d":function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return u}));var i=function(){var t=this,n=t.$createElement;t._self._c},a=[]},"5d6a":function(t,n,e){"use strict";var u=e("3b3c"),i=e.n(u);i.a},f978:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=function(){e.e("components/module/app-tag").then(function(){return resolve(e("1a62"))}.bind(null,e)).catch(e.oe)},i={name:"app-swiper",components:{AppTag:u},props:{list:{type:Array,default:function(){return[]}},tagShow:{type:Boolean,default:!1},autoplay:{type:Boolean,default:!0},width:{type:Object,default:function(){return{type:"string",val:"100%"}}},height:{type:Object,default:function(){return{type:"number",val:480}}}},data:function(){return{currentIndex:0}},computed:{widthFn:function(){return"number"==this.width.type?t.upx2px(this.width.val)+"px":this.width.val},heightFn:function(){return"number"==this.height.type?t.upx2px(this.height.val)+"px":this.height.val}},methods:{bannerChange:function(t){this.currentIndex=t.detail.current},detail:function(t){this.$emit("detail",t)}}};n.default=i}).call(this,e("f3be")["default"])}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/app-swiper-create-component',
     {

ghsApp/dist/build/mp-weixin/components/app-swiper.wxml

@@ -1 +1 @@
-<view class="swiper-wrap _div data-v-93d0fdca" style="{{'width:'+(widthFn)+';'+('height:'+(heightFn)+';')}}"><swiper class="tui-banner-swiper data-v-93d0fdca" indicator-dots="{{!tagShow}}" autoplay="{{autoplay}}" interval="{{5000}}" duration="{{150}}" circular="{{true}}" indicator-color="#969696" indicator-active-color="#3387ff" data-event-opts="{{[['change',[['bannerChange',['$event']]]]]}}" bindchange="__e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['detail',['$event']]]]]}}" catchtap="__e" class="data-v-93d0fdca"><image class="tui-slide-image _img data-v-93d0fdca" src="{{item.img}}" mode="scaleToFill"></image><view class="info data-v-93d0fdca">2312</view></swiper-item></block></swiper><block wx:if="{{tagShow}}"><app-tag class="swiper-tag data-v-93d0fdca" vue-id="4a80c472-1" type="translucent" shape="circleLeft" size="small" bind:__l="__l" vue-slots="{{['default']}}">{{index+1+"/"+list.length}}</app-tag></block></view>
+<view class="bigBox data-v-6b9dc305"><view class="swiper-wrap _div data-v-6b9dc305" style="{{'width:'+(widthFn)+';'+('height:'+(heightFn)+';')}}"><swiper class="tui-banner-swiper data-v-6b9dc305" indicator-dots="{{tagShow}}" autoplay="{{autoplay}}" interval="{{5000}}" duration="{{150}}" circular="{{true}}" indicator-color="#969696" indicator-active-color="#3387ff" data-event-opts="{{[['change',[['bannerChange',['$event']]]]]}}" bindchange="__e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['detail',['$event']]]]]}}" catchtap="__e" class="data-v-6b9dc305"><image class="tui-slide-image _img data-v-6b9dc305" src="{{item.img}}" mode="scaleToFill"></image><view class="info data-v-6b9dc305">2312</view></swiper-item></block></swiper></view><view class="swiper_dots data-v-6b9dc305"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><text class="{{['data-v-6b9dc305',(index===currentIndex)?'active':'']}}"></text></block></view></view>

ghsApp/dist/build/mp-weixin/components/app-swiper.wxss

@@ -1 +1 @@
-.swiper-wrap.data-v-93d0fdca{position:relative;height:480rpx;margin:0 auto;border-radius:20rpx;overflow:hidden}.swiper-wrap .tui-banner-swiper.data-v-93d0fdca{height:100%}.swiper-wrap .tui-slide-image.data-v-93d0fdca{width:100%;height:100%}.swiper-wrap .info.data-v-93d0fdca{position:absolute;bottom:0;left:0;width:100%;height:88rpx;line-height:88rpx;text-align:center;font-size:32rpx;color:#fff;background:rgba(0,0,0,.6)}
+.swiper-wrap.data-v-6b9dc305{position:relative;height:480rpx;margin:0 auto;border-radius:20rpx;overflow:hidden}.swiper-wrap .tui-banner-swiper.data-v-6b9dc305{height:100%}.swiper-wrap .tui-slide-image.data-v-6b9dc305{width:100%;height:100%}.swiper-wrap .info.data-v-6b9dc305{position:absolute;bottom:0;left:0;width:100%;height:88rpx;line-height:88rpx;text-align:center;font-size:32rpx;color:#fff;background:rgba(0,0,0,.6)}.bigBox.data-v-6b9dc305{height:450rpx;position:relative}.bigBox .swiper_dots.data-v-6b9dc305{position:absolute;bottom:10rpx;left:50%;z-index:2021;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.bigBox .swiper_dots > text.data-v-6b9dc305{display:inline-block;height:12rpx;width:12rpx;background:#ccc;border-radius:6rpx;margin-left:14rpx}.bigBox .swiper_dots > .active.data-v-6b9dc305{width:26rpx;background:#3387ff}

ghsApp/dist/build/mp-weixin/components/app-uploader.json

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

ghsApp/dist/build/mp-weixin/components/module/app-avatar.json

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

ghsApp/dist/build/mp-weixin/components/module/app-close.json

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

ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json

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

ghsApp/dist/build/mp-weixin/components/module/app-search.json

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

ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

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

ghsApp/dist/build/mp-weixin/components/plugin/fab.json

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

ghsApp/dist/build/mp-weixin/components/plugin/list-cell.json

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

ghsApp/dist/build/mp-weixin/components/plugin/selectList.json

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

ghsApp/dist/build/mp-weixin/components/plugin/tabs.json

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

ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

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

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

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

ghsApp/dist/build/mp-weixin/pagesOrder/ship.wxml

@@ -1 +1 @@
-<view class="app-content data-v-96f24fd8"><view class="order-info_box data-v-96f24fd8"><view class="order-info-list data-v-96f24fd8"><view class="list-item data-v-96f24fd8"><text class="data-v-96f24fd8">订单号</text><text class="data-v-96f24fd8">{{orderInfo.orderSn}}</text></view><view class="list-item data-v-96f24fd8"><text class="data-v-96f24fd8">下单时间</text><text class="data-v-96f24fd8">{{orderInfo.addTime}}</text></view><view class="list-item data-v-96f24fd8"><text class="data-v-96f24fd8">金额</text><text class="data-v-96f24fd8">{{orderInfo.actPrice}}</text></view></view><image src="/static/images/default-img.png" mode="scaleToFill" class="data-v-96f24fd8"></image></view><view class="step-content_box data-v-96f24fd8"><step-ship vue-id="05200bc3-1" orderComData="{{orderComData}}" data-event-opts="{{[['^sendConfirm',[['sendConfirm']]],['^affirmSend',[['affirmSend']]],['^selfSend',[['selfSend']]],['^sendParcel',[['sendParcel']]]]}}" bind:sendConfirm="__e" bind:affirmSend="__e" bind:selfSend="__e" bind:sendParcel="__e" class="data-v-96f24fd8" bind:__l="__l"></step-ship></view><modal-module vue-id="05200bc3-2" show="{{showSubmitModel}}" title="{{titText}}" color="#333" size="{{32}}" padding="30rpx 30rpx" data-event-opts="{{[['^cancel',[['modalCancel']]],['^click',[['submitEvent']]]]}}" bind:cancel="__e" bind:click="__e" class="data-v-96f24fd8" bind:__l="__l"></modal-module></view>
+<view class="app-content data-v-3ba54927"><view class="order-info_box data-v-3ba54927"><view class="order-info-list data-v-3ba54927"><view class="list-item data-v-3ba54927"><text class="data-v-3ba54927">订单号</text><text class="data-v-3ba54927">{{orderInfo.orderSn}}</text></view><view class="list-item data-v-3ba54927"><text class="data-v-3ba54927">下单时间</text><text class="data-v-3ba54927">{{orderInfo.addTime}}</text></view><view class="list-item data-v-3ba54927"><text class="data-v-3ba54927">金额</text><text class="data-v-3ba54927">{{orderInfo.actPrice}}</text></view></view><image src="/static/images/default-img.png" mode="scaleToFill" class="data-v-3ba54927"></image></view><view class="step-content_box data-v-3ba54927"><step-ship vue-id="05200bc3-1" orderComData="{{orderComData}}" data-event-opts="{{[['^sendConfirm',[['sendConfirm']]],['^affirmSend',[['affirmSend']]],['^selfSend',[['selfSend']]],['^sendParcel',[['sendParcel']]]]}}" bind:sendConfirm="__e" bind:affirmSend="__e" bind:selfSend="__e" bind:sendParcel="__e" class="data-v-3ba54927" bind:__l="__l"></step-ship></view><modal-module vue-id="05200bc3-2" show="{{showSubmitModel}}" title="{{titText}}" color="#333" size="{{32}}" padding="30rpx 30rpx" data-event-opts="{{[['^cancel',[['modalCancel']]],['^click',[['submitEvent']]]]}}" bind:cancel="__e" bind:click="__e" class="data-v-3ba54927" bind:__l="__l"></modal-module><kd-entrance vue-id="05200bc3-3" class="data-v-3ba54927" bind:__l="__l"></kd-entrance></view>

ghsApp/dist/build/mp-weixin/pagesOrder/ship.wxss

@@ -1 +1 @@
-.app-content .ship-modal .line-label.data-v-96f24fd8{width:140rpx}.order-info_box.data-v-96f24fd8{display:-webkit-box;display:-webkit-flex;display:flex;padding:30rpx;background-color:#fff;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-info_box .order-info-list.data-v-96f24fd8{-webkit-box-flex:1;-webkit-flex:1;flex:1}.order-info_box .order-info-list .list-item.data-v-96f24fd8{font-size:28rpx;font-weight:400}.order-info_box .order-info-list .list-item > text.data-v-96f24fd8:nth-child(1){color:#666;display:inline-block;width:140rpx}.order-info_box .order-info-list .list-item > text.data-v-96f24fd8:nth-child(1){color:#333}.order-info_box image.data-v-96f24fd8{width:146rpx;height:146rpx}.order-fa_box.data-v-96f24fd8{padding:20rpx;border:1rpx solid #ddd;border-radius:4rpx;margin-bottom:20rpx}.order-fa_box > .order-fa_info.data-v-96f24fd8{padding-left:20rpx}.order-fa_box > .order-fa_info > .order-fa_top.data-v-96f24fd8{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-fa_box > .order-fa_info > .order-fa_top > view.data-v-96f24fd8:nth-child(1){width:40rpx;height:40rpx;line-height:40rpx;text-align:center;background-color:#3385ff;color:#fff;font-size:24rpx;margin-right:20rpx;border-radius:50%}.order-fa_box > .order-fa_info > .order-fa_top > view.data-v-96f24fd8:nth-child(2){color:#333;font-size:32rpx;font-weight:600;color:#333}.order-fa_box > .order-fa_info > view.data-v-96f24fd8:nth-child(2){padding-left:60rpx;text-align:left;color:#999;font-size:24rpx;font-weight:400;margin:25rpx 0 19rpx}.order-fa_box > .order-fa_info > view.data-v-96f24fd8:nth-child(3){padding-left:60rpx;text-align:left;color:#333;font-size:24rpx;font-weight:400;margin:25rpx 0 19rpx}
+.app-content .ship-modal .line-label.data-v-3ba54927{width:140rpx}.order-info_box.data-v-3ba54927{display:-webkit-box;display:-webkit-flex;display:flex;padding:30rpx;background-color:#fff;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-info_box .order-info-list.data-v-3ba54927{-webkit-box-flex:1;-webkit-flex:1;flex:1}.order-info_box .order-info-list .list-item.data-v-3ba54927{font-size:28rpx;font-weight:400}.order-info_box .order-info-list .list-item > text.data-v-3ba54927:nth-child(1){color:#666;display:inline-block;width:140rpx}.order-info_box .order-info-list .list-item > text.data-v-3ba54927:nth-child(1){color:#333}.order-info_box image.data-v-3ba54927{width:146rpx;height:146rpx}.order-fa_box.data-v-3ba54927{padding:20rpx;border:1rpx solid #ddd;border-radius:4rpx;margin-bottom:20rpx}.order-fa_box > .order-fa_info.data-v-3ba54927{padding-left:20rpx}.order-fa_box > .order-fa_info > .order-fa_top.data-v-3ba54927{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-fa_box > .order-fa_info > .order-fa_top > view.data-v-3ba54927:nth-child(1){width:40rpx;height:40rpx;line-height:40rpx;text-align:center;background-color:#3385ff;color:#fff;font-size:24rpx;margin-right:20rpx;border-radius:50%}.order-fa_box > .order-fa_info > .order-fa_top > view.data-v-3ba54927:nth-child(2){color:#333;font-size:32rpx;font-weight:600;color:#333}.order-fa_box > .order-fa_info > view.data-v-3ba54927:nth-child(2){padding-left:60rpx;text-align:left;color:#999;font-size:24rpx;font-weight:400;margin:25rpx 0 19rpx}.order-fa_box > .order-fa_info > view.data-v-3ba54927:nth-child(3){padding-left:60rpx;text-align:left;color:#333;font-size:24rpx;font-weight:400;margin:25rpx 0 19rpx}

ghsApp/src/admin/home/workbench.vue

@@ -302,37 +302,47 @@ export default {
 		uni.stopPullDownRefresh();
 	},
 	onShow() {
-		this.init();
+		// this.init();
 	},
 	methods: {
 		init() {
-			getUser().then(res => {
-				uni.setNavigationBarTitle({
-					title: res.name
+			/*延迟监听token*/
+			if(!uni.getStorageSync('token')){
+				setTimeout(()=>{
+					this.init();
+				},100);
+			}else{
+				getUser().then(res => {
+					uni.setNavigationBarTitle({
+						title: res.name
+					});
+
+					let nowTime = getDataTimestamp(new Date(), true);
+					if (nowTime > res.setDeadline) {
+						this.renewMask = true;
+					}
 				});
+				consoleIndex().then(res => {
+					this.data = res.data;
+					const { asset, todayData } = res.data;
+					if (!this.$util.isEmpty(asset)) {
+						// 订单总览
+						this.orderData[0].value = asset.unPayOrder;
+						this.orderData[1].value = asset.unSendOrder;
+						this.orderData[2].value = asset.sendingOrder;
+						// 总览数据
+						this.totalData[0].value = asset.totalUser;
+						this.totalData[1].value = asset.totalView;
+						this.totalData[2].value = asset.finishOrder;
+						this.totalData[3].value = asset.totalIncome;
+						this.totalData[4].value = asset.totalExpend;
+						this.totalData[5].value = asset.totalPurchase;
+					}
+				});
+			}
+
+
 
-				let nowTime = getDataTimestamp(new Date(), true);
-				if (nowTime > res.setDeadline) {
-					this.renewMask = true;
-				}
-			});
-			consoleIndex().then(res => {
-				this.data = res.data;
-				const { asset, todayData } = res.data;
-				if (!this.$util.isEmpty(asset)) {
-					// 订单总览
-					this.orderData[0].value = asset.unPayOrder;
-					this.orderData[1].value = asset.unSendOrder;
-					this.orderData[2].value = asset.sendingOrder;
-					// 总览数据
-					this.totalData[0].value = asset.totalUser;
-					this.totalData[1].value = asset.totalView;
-					this.totalData[2].value = asset.finishOrder;
-					this.totalData[3].value = asset.totalIncome;
-					this.totalData[4].value = asset.totalExpend;
-					this.totalData[5].value = asset.totalPurchase;
-				}
-			});
 		},
 		// 跳转
 		pageToFn(item) {

ghsApp/src/mixins/priceSocket.js

@@ -10,28 +10,41 @@ export default {
 		};
 	},
 	onLaunch() {
-		this.priceSocket = new SocketUtil({
-			onOpen: () => {},
-			onMessage: data => {
-				let type = data.type || "";
-				switch (type) {
-					case "init":
-						let clientId = data.client_id;
+		this.priceSocketFun();
 
-						initSocket(clientId);
-						break;
-					case "money":
-						//到账消息    data:  {type: "money", msg: "微信到账1.2", money: 1.2}
-						console.log(data);
+	},
+	methods:{
+		/*延迟监听token*/
+		priceSocketFun(){
+			if(!uni.getStorageSync('token')){
+				setTimeout(()=>{
+					this.priceSocketFun();
+				},100);
+			}else{
+				this.priceSocket = new SocketUtil({
+					onOpen: () => {},
+					onMessage: data => {
+						let type = data.type || "";
+						switch (type) {
+							case "init":
+								let clientId = data.client_id;
+
+								initSocket(clientId);
+								break;
+							case "money":
+								//到账消息    data:  {type: "money", msg: "微信到账1.2", money: 1.2}
+								console.log(data);
 
-						this.playPriceAudio(data.money);
-						break;
-					default:
-						console.log("default");
-				}
-			},
-			onClose: () => {},
-			onError: () => {}
-		});
+								this.playPriceAudio(data.money);
+								break;
+							default:
+								console.log("default");
+						}
+					},
+					onClose: () => {},
+					onError: () => {}
+				});
+			}
+		},
 	}
 };

hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

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

hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

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

hdApp/dist/build/mp-weixin/admin/home/order.wxss

@@ -1,5 +1,5 @@
-.app-content.data-v-9566cf88{padding-top:120rpx;padding-bottom:1rpx}.app-content .list-wrap .list.data-v-9566cf88{padding:0 30rpx;background-color:#fff;margin-bottom:20rpx}.app-content .list-wrap .list .list-top.data-v-9566cf88,
-.app-content .list-wrap .list .list-bottom.data-v-9566cf88{padding:26rpx 0;border-bottom:1rpx solid #eee;color:#999}.app-content .list-wrap .list .list-top .app-bold.data-v-9566cf88,
-.app-content .list-wrap .list .list-bottom .app-bold.data-v-9566cf88{color:#333}.app-content .list-wrap .list .list-top .freight-text.data-v-9566cf88,
-.app-content .list-wrap .list .list-bottom .freight-text.data-v-9566cf88{margin-right:60rpx}.app-content .list-wrap .list .list-top .app-green.data-v-9566cf88,
-.app-content .list-wrap .list .list-bottom .app-green.data-v-9566cf88{color:green}.app-content .list-wrap .list .list-bottom > ._div.data-v-9566cf88{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-content .list-wrap .list .list-bottom .list-button.data-v-9566cf88{margin-top:26rpx}.app-content .list-wrap .list .list-bottom .list-button .admin-button-com.data-v-9566cf88{margin-left:20rpx}.upload-confirm-wrap.data-v-9566cf88{max-height:600rpx;overflow-y:auto}.upload-confirm-wrap .modal-tit.data-v-9566cf88{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;font-size:40rpx;margin-top:30rpx;margin-bottom:50rpx}.upload-confirm-wrap .modal-tit .iconfont.data-v-9566cf88{color:#09bb07;margin-right:20rpx;font-size:50rpx}.upload-confirm-wrap .sel-wrap.data-v-9566cf88{color:#666;font-size:32rpx}.upload-confirm-wrap .sel-wrap .sel-tit.data-v-9566cf88{text-align:left}.upload-confirm-wrap .sel-wrap .sel-btn.data-v-9566cf88{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:10rpx 0 40rpx}.upload-confirm-wrap .sel-wrap .sel-btn .admin-button-com.data-v-9566cf88{margin-right:20rpx;margin-top:20rpx;padding-top:16rpx;padding-bottom:16rpx;border-radius:4rpx}
+.app-content.data-v-67e6b5ad{padding-top:120rpx;padding-bottom:1rpx}.app-content .list-wrap .list.data-v-67e6b5ad{padding:0 30rpx;background-color:#fff;margin-bottom:20rpx}.app-content .list-wrap .list .list-top.data-v-67e6b5ad,
+.app-content .list-wrap .list .list-bottom.data-v-67e6b5ad{padding:26rpx 0;border-bottom:1rpx solid #eee;color:#999}.app-content .list-wrap .list .list-top .app-bold.data-v-67e6b5ad,
+.app-content .list-wrap .list .list-bottom .app-bold.data-v-67e6b5ad{color:#333}.app-content .list-wrap .list .list-top .freight-text.data-v-67e6b5ad,
+.app-content .list-wrap .list .list-bottom .freight-text.data-v-67e6b5ad{margin-right:60rpx}.app-content .list-wrap .list .list-top .app-green.data-v-67e6b5ad,
+.app-content .list-wrap .list .list-bottom .app-green.data-v-67e6b5ad{color:green}.app-content .list-wrap .list .list-bottom > ._div.data-v-67e6b5ad{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-content .list-wrap .list .list-bottom .list-button.data-v-67e6b5ad{margin-top:26rpx}.app-content .list-wrap .list .list-bottom .list-button .admin-button-com.data-v-67e6b5ad{margin-left:20rpx}.upload-confirm-wrap.data-v-67e6b5ad{max-height:600rpx;overflow-y:auto}.upload-confirm-wrap .modal-tit.data-v-67e6b5ad{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;font-size:40rpx;margin-top:30rpx;margin-bottom:50rpx}.upload-confirm-wrap .modal-tit .iconfont.data-v-67e6b5ad{color:#09bb07;margin-right:20rpx;font-size:50rpx}.upload-confirm-wrap .sel-wrap.data-v-67e6b5ad{color:#666;font-size:32rpx}.upload-confirm-wrap .sel-wrap .sel-tit.data-v-67e6b5ad{text-align:left}.upload-confirm-wrap .sel-wrap .sel-btn.data-v-67e6b5ad{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:10rpx 0 40rpx}.upload-confirm-wrap .sel-wrap .sel-btn .admin-button-com.data-v-67e6b5ad{margin-right:20rpx;margin-top:20rpx;padding-top:16rpx;padding-bottom:16rpx;border-radius:4rpx}

hdApp/dist/build/mp-weixin/admin/order/components/sel-express-confirm.wxss

@@ -1 +1 @@
-.confirm-wrap .axis-det.data-v-191acce9{margin-top:20rpx;margin-bottom:10rpx;color:#666}.confirm-wrap .axis-det > ._div.data-v-191acce9{margin-top:14rpx}.confirm-wrap .axis-det > ._div.data-v-191acce9:first-child{margin-top:0}.confirm-wrap .axis-det .admin-button-com.data-v-191acce9{width:120rpx;margin-top:20rpx}.confirm-wrap .axis-det .modify-btn.data-v-191acce9{color:#3385ff;font-size:24rpx;margin-left:30rpx}.com-wrap .axis-det.data-v-191acce9{margin-top:14rpx}.com-wrap .axis-det > ._div.data-v-191acce9{margin-top:20rpx}.com-wrap .axis-det > ._div.data-v-191acce9:first-child{margin-top:0}.com-wrap .express-wrap .admin-button-com.data-v-191acce9{width:100%}.com-wrap .express-wrap .button-prompt.data-v-191acce9{text-align:center;color:#666}
+.confirm-wrap .axis-det.data-v-5a386c85{margin-top:20rpx;margin-bottom:10rpx;color:#666}.confirm-wrap .axis-det > ._div.data-v-5a386c85{margin-top:14rpx}.confirm-wrap .axis-det > ._div.data-v-5a386c85:first-child{margin-top:0}.confirm-wrap .axis-det .admin-button-com.data-v-5a386c85{width:120rpx;margin-top:20rpx}.confirm-wrap .axis-det .modify-btn.data-v-5a386c85{color:#3385ff;font-size:24rpx;margin-left:30rpx}.com-wrap .axis-det.data-v-5a386c85{margin-top:14rpx}.com-wrap .axis-det > ._div.data-v-5a386c85{margin-top:20rpx}.com-wrap .axis-det > ._div.data-v-5a386c85:first-child{margin-top:0}.com-wrap .express-wrap .admin-button-com.data-v-5a386c85{width:100%}.com-wrap .express-wrap .button-prompt.data-v-5a386c85{text-align:center;color:#666}

hdApp/dist/build/mp-weixin/admin/order/components/sel-order.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/order/components/sel-order"],{1414:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r=t("3a10"),i=function(){t.e("admin/home/components/plugin/time-axis").then(function(){return resolve(t("9193"))}.bind(null,t)).catch(t.oe)},o=function(){t.e("admin/home/components/plugin/timeaxis-item").then(function(){return resolve(t("9758"))}.bind(null,t)).catch(t.oe)},a={name:"sel-order-module",components:{TimeAxis:i,TimeaxisItem:o},props:{query:{type:Object,default:function(){}},orderData:{type:Object,default:function(){}}},data:function(){return{data:{}}},mounted:function(){},methods:{hasSendOrderFn:function(){var e=this;(0,r.printOrder)({id:this.orderData.id,option:1}).then((function(n){e.$emit("nextPageSuccess",{id:e.orderData.id,pageStatus:7})}))}}};n.default=a},"225c":function(e,n,t){"use strict";var r=t("beb4"),i=t.n(r);i.a},8330:function(e,n,t){"use strict";var r;t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return o})),t.d(n,"a",(function(){return r}));var i=function(){var e=this,n=e.$createElement,t=(e._self._c,e._f("formatTime")(e.orderData.addTime));e.$mp.data=Object.assign({},{$root:{f0:t}})},o=[]},beb4:function(e,n,t){},bf50:function(e,n,t){"use strict";t.r(n);var r=t("1414"),i=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(o);n["default"]=i.a},ecde:function(e,n,t){"use strict";t.r(n);var r=t("8330"),i=t("bf50");for(var o in i)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(o);t("225c");var a,u=t("0095"),c=Object(u["a"])(i["default"],r["b"],r["c"],!1,null,"489bd793",null,!1,r["a"],a);n["default"]=c.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/order/components/sel-order"],{"05c7":function(n,e,t){"use strict";var i;t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return o})),t.d(e,"a",(function(){return i}));var r=function(){var n=this,e=n.$createElement;n._self._c},o=[]},1414:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=t("3a10"),r=function(){t.e("admin/home/components/plugin/time-axis").then(function(){return resolve(t("9193"))}.bind(null,t)).catch(t.oe)},o=function(){t.e("admin/home/components/plugin/timeaxis-item").then(function(){return resolve(t("9758"))}.bind(null,t)).catch(t.oe)},u={name:"sel-order-module",components:{TimeAxis:r,TimeaxisItem:o},props:{query:{type:Object,default:function(){}},orderData:{type:Object,default:function(){}}},data:function(){return{data:{}}},mounted:function(){},methods:{hasSendOrderFn:function(){var n=this;(0,i.printOrder)({id:this.orderData.id,option:1}).then((function(e){n.$emit("nextPageSuccess",{id:n.orderData.id,pageStatus:7})}))}}};e.default=u},"52e7":function(n,e,t){},a6ff:function(n,e,t){"use strict";var i=t("52e7"),r=t.n(i);r.a},bf50:function(n,e,t){"use strict";t.r(e);var i=t("1414"),r=t.n(i);for(var o in i)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return i[n]}))}(o);e["default"]=r.a},ecde:function(n,e,t){"use strict";t.r(e);var i=t("05c7"),r=t("bf50");for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);t("a6ff");var u,a=t("0095"),c=Object(a["a"])(r["default"],i["b"],i["c"],!1,null,"133340ca",null,!1,i["a"],u);e["default"]=c.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'admin/order/components/sel-order-create-component',
     {

hdApp/dist/build/mp-weixin/admin/order/components/sel-order.wxml

@@ -1 +1 @@
-<view class="sel-order-module _div data-v-489bd793"><time-axis vue-id="3493b9d5-1" class="data-v-489bd793" bind:__l="__l" vue-slots="{{['default']}}"><timeaxis-item class="axis-list axis-first print-order data-v-489bd793" vue-id="{{('3493b9d5-2')+','+('3493b9d5-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['node','content']}}"><view slot="node"><view class="tui-node node-big _div data-v-489bd793"><view class="node-small _div data-v-489bd793"></view></view></view><view slot="content"><view class="axis-slot-wrap _div data-v-489bd793"><view class="axis-title _div data-v-489bd793">制单</view><view class="axis-det _div data-v-489bd793"><button data-event-opts="{{[['tap',[['hasSendOrderFn',['$event']]]]]}}" class="admin-button-com big blue data-v-489bd793" bindtap="__e">跳过</button><button data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/order/fill-form'],['query',{id:orderData.id}]]]]]]]}}" class="admin-button-com big blue data-v-489bd793" bindtap="__e">填写</button></view></view></view></timeaxis-item><timeaxis-item class="axis-list down-order data-v-489bd793" vue-id="{{('3493b9d5-3')+','+('3493b9d5-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content"><view class="axis-slot-wrap _div data-v-489bd793"><view class="axis-title _div data-v-489bd793">下单</view><view class="axis-det _div data-v-489bd793"><view class="_div data-v-489bd793">{{$root.f0}}</view></view></view></view></timeaxis-item></time-axis></view>
+<view class="sel-order-module _div data-v-133340ca"><time-axis vue-id="3493b9d5-1" class="data-v-133340ca" bind:__l="__l" vue-slots="{{['default']}}"><timeaxis-item class="axis-list axis-first print-order data-v-133340ca" vue-id="{{('3493b9d5-2')+','+('3493b9d5-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['node','content']}}"><view slot="node"><view class="tui-node node-big _div data-v-133340ca"><view class="node-small _div data-v-133340ca"></view></view></view><view slot="content"><view class="axis-slot-wrap _div data-v-133340ca"><view class="axis-title _div data-v-133340ca">制单</view><view class="axis-det _div data-v-133340ca"><button data-event-opts="{{[['tap',[['hasSendOrderFn',['$event']]]]]}}" class="admin-button-com big blue data-v-133340ca" bindtap="__e">跳过</button><button data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/order/fill-form'],['query',{id:orderData.id}]]]]]]]}}" class="admin-button-com big blue data-v-133340ca" bindtap="__e">填写</button></view></view></view></timeaxis-item><timeaxis-item class="axis-list down-order data-v-133340ca" vue-id="{{('3493b9d5-3')+','+('3493b9d5-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content"><view class="axis-slot-wrap _div data-v-133340ca"><view class="axis-title _div data-v-133340ca">下单</view><view class="axis-det _div data-v-133340ca"><view class="_div data-v-133340ca">{{orderData.addTime}}</view></view></view></view></timeaxis-item></time-axis></view>

hdApp/dist/build/mp-weixin/admin/order/components/sel-order.wxss

@@ -1 +1 @@
-.print-order .axis-slot-wrap.data-v-489bd793{top:-4rpx!important}.print-order .axis-det.data-v-489bd793{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;margin-top:50rpx;margin-bottom:10rpx}.print-order .axis-det .admin-button-com.data-v-489bd793{width:48%}.down-order .axis-det.data-v-489bd793{margin-top:14rpx}
+.print-order .axis-slot-wrap.data-v-133340ca{top:-4rpx!important}.print-order .axis-det.data-v-133340ca{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;margin-top:50rpx;margin-bottom:10rpx}.print-order .axis-det .admin-button-com.data-v-133340ca{width:48%}.down-order .axis-det.data-v-133340ca{margin-top:14rpx}

hdApp/dist/build/mp-weixin/admin/order/components/sel-ship-confirm.wxss

@@ -1 +1 @@
-.confirm-wrap .axis-det.data-v-e3e5c014{margin-top:20rpx;margin-bottom:10rpx;color:#666}.confirm-wrap .axis-det > ._div.data-v-e3e5c014{margin-top:10rpx}.confirm-wrap .axis-det > ._div.data-v-e3e5c014:first-child{margin-top:0}.confirm-wrap .axis-det .admin-button-com.data-v-e3e5c014{width:120rpx;margin-top:20rpx}.confirm-wrap .axis-det .modify-btn.data-v-e3e5c014{color:#3385ff;font-size:24rpx;margin-left:30rpx}.com-wrap .axis-det.data-v-e3e5c014{margin-top:14rpx}.com-wrap .axis-det > ._div.data-v-e3e5c014{margin-top:20rpx}.com-wrap .axis-det > ._div.data-v-e3e5c014:first-child{margin-top:0}.upload-confirm-wrap.data-v-e3e5c014{max-height:600rpx;overflow-y:auto}.upload-confirm-wrap .modal-tit.data-v-e3e5c014{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;font-size:40rpx;margin-top:30rpx;margin-bottom:50rpx}.upload-confirm-wrap .modal-tit .iconfont.data-v-e3e5c014{color:#09bb07;margin-right:20rpx;font-size:50rpx}.upload-confirm-wrap .sel-wrap.data-v-e3e5c014{color:#666;font-size:32rpx}.upload-confirm-wrap .sel-wrap .sel-tit.data-v-e3e5c014{text-align:left}.upload-confirm-wrap .sel-wrap .sel-btn.data-v-e3e5c014{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:10rpx 0 40rpx}.upload-confirm-wrap .sel-wrap .sel-btn .admin-button-com.data-v-e3e5c014{margin-right:20rpx;margin-top:20rpx;padding-top:16rpx;padding-bottom:16rpx;border-radius:4rpx}
+.confirm-wrap .axis-det.data-v-8b55b77e{margin-top:20rpx;margin-bottom:10rpx;color:#666}.confirm-wrap .axis-det > ._div.data-v-8b55b77e{margin-top:10rpx}.confirm-wrap .axis-det > ._div.data-v-8b55b77e:first-child{margin-top:0}.confirm-wrap .axis-det .admin-button-com.data-v-8b55b77e{width:120rpx;margin-top:20rpx}.confirm-wrap .axis-det .modify-btn.data-v-8b55b77e{color:#3385ff;font-size:24rpx;margin-left:30rpx}.com-wrap .axis-det.data-v-8b55b77e{margin-top:14rpx}.com-wrap .axis-det > ._div.data-v-8b55b77e{margin-top:20rpx}.com-wrap .axis-det > ._div.data-v-8b55b77e:first-child{margin-top:0}.upload-confirm-wrap.data-v-8b55b77e{max-height:600rpx;overflow-y:auto}.upload-confirm-wrap .modal-tit.data-v-8b55b77e{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;font-size:40rpx;margin-top:30rpx;margin-bottom:50rpx}.upload-confirm-wrap .modal-tit .iconfont.data-v-8b55b77e{color:#09bb07;margin-right:20rpx;font-size:50rpx}.upload-confirm-wrap .sel-wrap.data-v-8b55b77e{color:#666;font-size:32rpx}.upload-confirm-wrap .sel-wrap .sel-tit.data-v-8b55b77e{text-align:left}.upload-confirm-wrap .sel-wrap .sel-btn.data-v-8b55b77e{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:10rpx 0 40rpx}.upload-confirm-wrap .sel-wrap .sel-btn .admin-button-com.data-v-8b55b77e{margin-right:20rpx;margin-top:20rpx;padding-top:16rpx;padding-bottom:16rpx;border-radius:4rpx}

hdApp/dist/build/mp-weixin/admin/order/components/sel-ship-manage.wxss

@@ -1 +1 @@
-.axis-first .axis-det.data-v-33e54688{margin-top:40rpx!important}.axis-first .confirm-btn.data-v-33e54688{width:40%}.com-wrap .axis-det.data-v-33e54688{margin-top:14rpx}.com-wrap .axis-det > ._div.data-v-33e54688{margin-top:20rpx}.com-wrap .axis-det > ._div.data-v-33e54688:first-child{margin-top:0}.ship-modal .line-label.data-v-33e54688{width:140rpx}.btn-wrap.data-v-33e54688{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}
+.axis-first .axis-det.data-v-69ddc63a{margin-top:40rpx!important}.axis-first .confirm-btn.data-v-69ddc63a{width:40%}.com-wrap .axis-det.data-v-69ddc63a{margin-top:14rpx}.com-wrap .axis-det > ._div.data-v-69ddc63a{margin-top:20rpx}.com-wrap .axis-det > ._div.data-v-69ddc63a:first-child{margin-top:0}.ship-modal .line-label.data-v-69ddc63a{width:140rpx}.btn-wrap.data-v-69ddc63a{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}

hdApp/dist/build/mp-weixin/admin/order/components/sel-ship.wxml

@@ -1 +1 @@
-<view class="sel-ship-module _div data-v-1ecdb84e"><time-axis vue-id="828f49c6-1" class="data-v-1ecdb84e" bind:__l="__l" vue-slots="{{['default']}}"><timeaxis-item class="axis-list axis-first print-order data-v-1ecdb84e" vue-id="{{('828f49c6-2')+','+('828f49c6-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content"><view class="axis-slot-wrap _div data-v-1ecdb84e"><view class="axis-title _div data-v-1ecdb84e">制单</view><view class="axis-det _div data-v-1ecdb84e"><view class="_div data-v-1ecdb84e">{{$root.f0}}</view><card-name vue-id="{{('828f49c6-3')+','+('828f49c6-2')}}" info="{{orderComData[0].receive}}" class="data-v-1ecdb84e" bind:__l="__l"></card-name><view class="btn-wrap-com _div data-v-1ecdb84e"><button data-event-opts="{{[['tap',[['printOrderFn',['$event']]]]]}}" class="admin-button-com default data-v-1ecdb84e" bindtap="__e">打印</button><button data-event-opts="{{[['tap',[['modifyPrintFn',['$event']]]]]}}" class="admin-button-com default data-v-1ecdb84e" bindtap="__e">修改</button><button data-event-opts="{{[['tap',[['printerSetFn',['$event']]]]]}}" class="admin-button-com default data-v-1ecdb84e" bindtap="__e">打印机</button></view></view></view></view></timeaxis-item><timeaxis-item class="axis-list down-order data-v-1ecdb84e" vue-id="{{('828f49c6-4')+','+('828f49c6-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content"><view class="axis-slot-wrap _div data-v-1ecdb84e"><view class="axis-title _div data-v-1ecdb84e">{{orderComData[1].actionName}}</view><view class="axis-det _div data-v-1ecdb84e"><view class="_div data-v-1ecdb84e">{{$root.f1}}</view></view></view></view></timeaxis-item></time-axis></view>
+<view class="sel-ship-module _div data-v-2695d3e6"><time-axis vue-id="828f49c6-1" class="data-v-2695d3e6" bind:__l="__l" vue-slots="{{['default']}}"><timeaxis-item class="axis-list axis-first print-order data-v-2695d3e6" vue-id="{{('828f49c6-2')+','+('828f49c6-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content"><view class="axis-slot-wrap _div data-v-2695d3e6"><view class="axis-title _div data-v-2695d3e6">制单</view><view class="axis-det _div data-v-2695d3e6"><view class="_div data-v-2695d3e6">{{$root.f0}}</view><card-name vue-id="{{('828f49c6-3')+','+('828f49c6-2')}}" info="{{orderComData[0].receive}}" class="data-v-2695d3e6" bind:__l="__l"></card-name><view class="btn-wrap-com _div data-v-2695d3e6"><button data-event-opts="{{[['tap',[['printOrderFn',['$event']]]]]}}" class="admin-button-com default data-v-2695d3e6" bindtap="__e">打印</button><button data-event-opts="{{[['tap',[['modifyPrintFn',['$event']]]]]}}" class="admin-button-com default data-v-2695d3e6" bindtap="__e">修改</button></view></view></view></view></timeaxis-item><timeaxis-item class="axis-list down-order data-v-2695d3e6" vue-id="{{('828f49c6-4')+','+('828f49c6-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content"><view class="axis-slot-wrap _div data-v-2695d3e6"><view class="axis-title _div data-v-2695d3e6">{{orderComData[1].actionName}}</view><view class="axis-det _div data-v-2695d3e6"><view class="_div data-v-2695d3e6">{{$root.f1}}</view></view></view></view></timeaxis-item></time-axis></view>

hdApp/dist/build/mp-weixin/admin/order/components/sel-ship.wxss

@@ -1 +1 @@
-.ship-goods .axis-slot-wrap.data-v-1ecdb84e{top:-4rpx!important}.ship-goods .axis-det.data-v-1ecdb84e{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;margin-top:50rpx;margin-bottom:10rpx}.ship-goods .axis-det .admin-button-com.data-v-1ecdb84e{width:48%}.print-order .axis-det.data-v-1ecdb84e{margin-top:14rpx}.print-order .axis-det > ._div.data-v-1ecdb84e{margin-top:20rpx}.print-order .axis-det > ._div.data-v-1ecdb84e:first-child{margin-top:0}.down-order .axis-det.data-v-1ecdb84e{margin-top:14rpx}
+.ship-goods .axis-slot-wrap.data-v-2695d3e6{top:-4rpx!important}.ship-goods .axis-det.data-v-2695d3e6{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;margin-top:50rpx;margin-bottom:10rpx}.ship-goods .axis-det .admin-button-com.data-v-2695d3e6{width:48%}.print-order .axis-det.data-v-2695d3e6{margin-top:14rpx}.print-order .axis-det > ._div.data-v-2695d3e6{margin-top:20rpx}.print-order .axis-det > ._div.data-v-2695d3e6:first-child{margin-top:0}.down-order .axis-det.data-v-2695d3e6{margin-top:14rpx}

hdApp/dist/build/mp-weixin/admin/order/fill-form.wxml

@@ -1 +1 @@
-<view class="app-content _div data-v-299dfb08"><form data-event-opts="{{[['submit',[['formSubmit',['$event']]]]]}}" bindsubmit="__e" class="data-v-299dfb08"><app-delivery-module vue-id="245cc112-1" data-ref="appDelivery" class="data-v-299dfb08 vue-ref" bind:__l="__l"></app-delivery-module><view class="app-footer _div data-v-299dfb08"><button class="admin-button-com blue middle data-v-299dfb08" formType="submit">提交</button></view></form></view>
+<view class="app-content _div data-v-65d219ca"><form data-event-opts="{{[['submit',[['formSubmit',['$event']]]]]}}" bindsubmit="__e" class="data-v-65d219ca"><app-delivery-module vue-id="245cc112-1" data-ref="appDelivery" class="data-v-65d219ca vue-ref" bind:__l="__l"></app-delivery-module><view class="app-footer _div data-v-65d219ca"><button class="admin-button-com blue middle data-v-65d219ca" formType="submit">提交</button></view></form></view>

hdApp/dist/build/mp-weixin/admin/order/fill-form.wxss

@@ -1 +1 @@
-.none-name-delivery.data-v-299dfb08{padding-left:30rpx;margin-top:40rpx}.none-name-delivery .none-name-text.data-v-299dfb08{margin-left:14rpx;color:#666}.app-footer .admin-button-com.data-v-299dfb08{width:90%}
+.none-name-delivery.data-v-65d219ca{padding-left:30rpx;margin-top:40rpx}.none-name-delivery .none-name-text.data-v-65d219ca{margin-left:14rpx;color:#666}.app-footer .admin-button-com.data-v-65d219ca{width:90%}

hdApp/dist/build/mp-weixin/components/app-bind-info.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/app-bind-info"],{"3c0fa":function(n,t,e){"use strict";e.r(t);var i=e("cbe7"),o=e.n(i);for(var a in i)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(a);t["default"]=o.a},"64d0":function(n,t,e){},7262:function(n,t,e){"use strict";var i;e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return i}));var o=function(){var n=this,t=n.$createElement,e=(n._self._c,n.$util.isEmpty(n.form.name)),i=n.$util.isEmpty(n.form.mobile);n.$mp.data=Object.assign({},{$root:{g0:e,g1:i}})},a=[]},c292:function(n,t,e){"use strict";var i=e("64d0"),o=e.n(i);o.a},cbe7:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=e("6436"),o=function(){e.e("components/plugin/list-cell").then(function(){return resolve(e("1861"))}.bind(null,e)).catch(e.oe)},a={name:"AppBindInfo",props:{nameTetx:{type:String,default:"微信昵称"}},components:{TuiListCell:o},data:function(){return{form:{name:"",mobile:""}}},methods:{getWxAvatar:function(){var t=this;n.getUserInfo({provider:"weixin",success:function(e){(0,i.getWxInfo)({iv:e.iv,encryptedData:e.encryptedData}).then((function(e){t.form.name=e.data.name,t.$emit("bindInfo",t.form),n.showToast({icon:"success"})}))},fail:function(){}})},getWxMobile:function(t){var e=this;"getPhoneNumber:ok"===t.detail.errMsg?(0,i.getWxPhone)({iv:t.detail.iv,encryptedData:t.detail.encryptedData}).then((function(t){e.form.mobile=t.data.mobile,e.$emit("bindInfo",e.form),n.showToast({icon:"success"})})):this.$msg("获取信息失败！")}}};t.default=a}).call(this,e("f3be")["default"])},e6d7:function(n,t,e){"use strict";e.r(t);var i=e("7262"),o=e("3c0fa");for(var a in o)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(a);e("c292");var c,r=e("0095"),u=Object(r["a"])(o["default"],i["b"],i["c"],!1,null,"4bbf8c94",null,!1,i["a"],c);t["default"]=u.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/app-bind-info"],{2433:function(n,t,e){"use strict";var i=e("7b93"),o=e.n(i);o.a},"3c0fa":function(n,t,e){"use strict";e.r(t);var i=e("cbe7"),o=e.n(i);for(var a in i)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(a);t["default"]=o.a},"7b93":function(n,t,e){},ab6c:function(n,t,e){"use strict";var i;e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return i}));var o=function(){var n=this,t=n.$createElement,e=(n._self._c,n.$util.isEmpty(n.form.name)),i=n.$util.isEmpty(n.form.mobile);n.$mp.data=Object.assign({},{$root:{g0:e,g1:i}})},a=[]},cbe7:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=e("6436"),o=function(){e.e("components/plugin/list-cell").then(function(){return resolve(e("1861"))}.bind(null,e)).catch(e.oe)},a={name:"AppBindInfo",props:{nameTetx:{type:String,default:"昵称"}},components:{TuiListCell:o},data:function(){return{form:{name:"",mobile:""}}},methods:{getWxAvatar:function(){var t=this;n.getUserInfo({provider:"weixin",success:function(e){(0,i.getWxInfo)({iv:e.iv,encryptedData:e.encryptedData}).then((function(e){t.form.name=e.data.name,t.$emit("bindInfo",t.form),n.showToast({icon:"success"})}))},fail:function(){}})},getWxMobile:function(t){var e=this;"getPhoneNumber:ok"===t.detail.errMsg?(0,i.getWxPhone)({iv:t.detail.iv,encryptedData:t.detail.encryptedData}).then((function(t){e.form.mobile=t.data.mobile,e.$emit("bindInfo",e.form),n.showToast({icon:"success"})})):this.$msg("获取信息失败！")}}};t.default=a}).call(this,e("f3be")["default"])},e6d7:function(n,t,e){"use strict";e.r(t);var i=e("ab6c"),o=e("3c0fa");for(var a in o)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(a);e("2433");var c,r=e("0095"),u=Object(r["a"])(o["default"],i["b"],i["c"],!1,null,"35e7a143",null,!1,i["a"],c);t["default"]=u.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/app-bind-info-create-component',
     {

hdApp/dist/build/mp-weixin/components/app-bind-info.wxml

@@ -1 +1 @@
-<view class="data-v-4bbf8c94"><tui-list-cell class="line-cell data-v-4bbf8c94" vue-id="459e3f02-1" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-4bbf8c94" style="width:120rpx;">{{nameTetx}}</view><block wx:if="{{!$root.g0}}"><view style="width:400rpx;padding-left:90rpx;" class="data-v-4bbf8c94">{{form.name+''}}</view></block><block wx:else><view class="plart-tit data-v-4bbf8c94" style="width:400rpx;text-align:center;">请点击右边按钮</view></block><button class="admin-button-com blue mini-btn data-v-4bbf8c94" open-type="getUserInfo" data-event-opts="{{[['getuserinfo',[['getWxAvatar',['$event']]]]]}}" bindgetuserinfo="__e">帮我填</button></tui-list-cell><tui-list-cell class="line-cell data-v-4bbf8c94" vue-id="459e3f02-2" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-4bbf8c94" style="width:120rpx;">手机号</view><block wx:if="{{!$root.g1}}"><view style="width:400rpx;padding-left:90rpx;" class="data-v-4bbf8c94">{{form.mobile}}</view></block><block wx:else><view class="plart-tit data-v-4bbf8c94" style="width:400rpx;text-align:center;">请点击右边按钮</view></block><button class="admin-button-com blue mini-btn data-v-4bbf8c94" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getWxMobile',['$event']]]]]}}" bindgetphonenumber="__e">帮我填</button></tui-list-cell></view>
+<view class="data-v-35e7a143"><tui-list-cell class="line-cell data-v-35e7a143" vue-id="459e3f02-1" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-35e7a143" style="width:120rpx;">{{nameTetx}}</view><block wx:if="{{!$root.g0}}"><view style="width:400rpx;padding-left:90rpx;" class="data-v-35e7a143">{{form.name+''}}</view></block><block wx:else><view class="plart-tit data-v-35e7a143" style="width:400rpx;text-align:center;">请点击右边按钮</view></block><button class="admin-button-com blue mini-btn data-v-35e7a143" open-type="getUserInfo" data-event-opts="{{[['getuserinfo',[['getWxAvatar',['$event']]]]]}}" bindgetuserinfo="__e">帮我填</button></tui-list-cell><tui-list-cell class="line-cell data-v-35e7a143" vue-id="459e3f02-2" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-35e7a143" style="width:120rpx;">手机号</view><block wx:if="{{!$root.g1}}"><view style="width:400rpx;padding-left:90rpx;" class="data-v-35e7a143">{{form.mobile}}</view></block><block wx:else><view class="plart-tit data-v-35e7a143" style="width:400rpx;text-align:center;">请点击右边按钮</view></block><button class="admin-button-com blue mini-btn data-v-35e7a143" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getWxMobile',['$event']]]]]}}" bindgetphonenumber="__e">帮我填</button></tui-list-cell></view>

hdApp/dist/build/mp-weixin/components/app-bind-info.wxss

@@ -1 +1 @@
-.plart-tit.data-v-4bbf8c94{color:#ccc;font-size:28rpx;font-weight:400}.tui-title.data-v-4bbf8c94{color:#666;font-size:28rpx;font-weight:400}
+.plart-tit.data-v-35e7a143{color:#ccc;font-size:28rpx;font-weight:400}.tui-title.data-v-35e7a143{color:#666;font-size:28rpx;font-weight:400}

hdApp/dist/build/mp-weixin/components/app-date-picker.json

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

hdApp/dist/build/mp-weixin/components/app-delivery.wxss

@@ -1 +1 @@
-.app-delivery-module .module-com.data-v-50ac5116{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .module-com .module-tit.data-v-50ac5116{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.app-delivery-module .module-com .module-det.data-v-50ac5116{padding:0 30rpx}.app-delivery-module .line-cell .tui-title.data-v-50ac5116{width:210rpx;color:#666}.app-delivery-module .line-cell .tui-input.data-v-50ac5116{width:calc(100% - 210rpx);font-size:28rpx}.app-delivery-module .line-cell .tui-placeholder.data-v-50ac5116{color:#ccc}.app-delivery-module .line-cell .phcolor.data-v-50ac5116{color:#ccc}.app-delivery-module .delivery-time.data-v-50ac5116{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;background-color:#fff;padding:20rpx 0}.app-delivery-module .delivery-time .button-com.data-v-50ac5116{padding-top:14rpx;padding-bottom:10rpx;margin:0 10rpx}.app-delivery-module .gift-wrap .gift-content.data-v-50ac5116{width:100%}.app-delivery-module .gift-wrap .need-gift.data-v-50ac5116{margin-left:14rpx;color:#666}.app-delivery-module .gift-wrap .gitf-textarea.data-v-50ac5116{margin-top:40rpx}.app-delivery-module .none-name-delivery.data-v-50ac5116{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .none-name-delivery .none-name-text.data-v-50ac5116{margin-left:14rpx;color:#666}
+.app-delivery-module .module-com.data-v-14ccdba5{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .module-com .module-tit.data-v-14ccdba5{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.app-delivery-module .module-com .module-det.data-v-14ccdba5{padding:0 30rpx}.app-delivery-module .line-cell .tui-title.data-v-14ccdba5{width:210rpx;color:#666}.app-delivery-module .line-cell .tui-input.data-v-14ccdba5{width:calc(100% - 210rpx);font-size:28rpx}.app-delivery-module .line-cell .tui-placeholder.data-v-14ccdba5{color:#ccc}.app-delivery-module .line-cell .phcolor.data-v-14ccdba5{color:#ccc}.app-delivery-module .delivery-time.data-v-14ccdba5{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;background-color:#fff;padding:20rpx 0}.app-delivery-module .delivery-time .button-com.data-v-14ccdba5{padding-top:14rpx;padding-bottom:10rpx;margin:0 10rpx}.app-delivery-module .gift-wrap .gift-content.data-v-14ccdba5{width:100%}.app-delivery-module .gift-wrap .need-gift.data-v-14ccdba5{margin-left:14rpx;color:#666}.app-delivery-module .gift-wrap .gitf-textarea.data-v-14ccdba5{margin-top:40rpx}.app-delivery-module .none-name-delivery.data-v-14ccdba5{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .none-name-delivery .none-name-text.data-v-14ccdba5{margin-left:14rpx;color:#666}

hdApp/dist/build/mp-weixin/components/kd_entrance.json

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

hdApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json

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

hdApp/dist/build/mp-weixin/components/module/allSelectInput.json

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

hdApp/dist/build/mp-weixin/components/module/app-avatar.json

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

hdApp/dist/build/mp-weixin/components/module/app-close.json

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

hdApp/dist/build/mp-weixin/components/module/app-footer-cart.json

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

hdApp/dist/build/mp-weixin/components/module/app-goods-commodity-style.json

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

hdApp/dist/build/mp-weixin/components/module/app-vip.json

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

hdApp/dist/build/mp-weixin/components/plugin/alert.json

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

hdApp/dist/build/mp-weixin/components/plugin/badge.json

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

hdApp/dist/build/mp-weixin/components/plugin/list-cell.json

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

hdApp/dist/build/mp-weixin/components/plugin/modal.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/plugin/modal"],{"36e9":function(t,e,n){},"3a8f":function(t,e,n){"use strict";n.r(e);var a=n("e19c6"),u=n("c17c");for(var i in u)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(i);n("e82c");var o,r=n("0095"),c=Object(r["a"])(u["default"],a["b"],a["c"],!1,null,"9e6b0bb8",null,!1,a["a"],o);e["default"]=c.exports},c17c:function(t,e,n){"use strict";n.r(e);var a=n("cadc"),u=n.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=u.a},cadc:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={name:"tuiModal",props:{show:{type:Boolean,default:!1},width:{type:String,default:"84%"},padding:{type:String,default:"40rpx 30rpx"},radius:{type:String,default:"24rpx"},title:{type:String,default:""},content:{type:String,default:""},color:{type:String,default:"#999"},bgcolor:{type:String,default:"#fff"},size:{type:Number,default:28},shape:{type:String,default:"square"},button:{type:Array,default:function(){return[{text:"取消",plain:!0},{text:"确定",plain:!1}]}},maskClosable:{type:Boolean,default:!0},custom:{type:Boolean,default:!1},fadein:{type:Boolean,default:!1}},computed:{isCustomContent:function(){return!!this.$slots.customContent}},data:function(){return{}},mounted:function(){console.log(this)},methods:{handleClick:function(t){if(this.show){var e=t.currentTarget.dataset;this.$emit("click",{index:Number(e.index)})}},handleClickCancel:function(){this.maskClosable&&this.$emit("click",{index:0})}}};e.default=a},e19c6:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var u=function(){var t=this,e=t.$createElement;t._self._c},i=[]},e82c:function(t,e,n){"use strict";var a=n("36e9"),u=n.n(a);u.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/plugin/modal"],{"36e9":function(t,e,n){},"3a8f":function(t,e,n){"use strict";n.r(e);var a=n("e19c"),u=n("c17c");for(var i in u)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(i);n("e82c");var o,r=n("0095"),c=Object(r["a"])(u["default"],a["b"],a["c"],!1,null,"9e6b0bb8",null,!1,a["a"],o);e["default"]=c.exports},c17c:function(t,e,n){"use strict";n.r(e);var a=n("cadc"),u=n.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=u.a},cadc:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={name:"tuiModal",props:{show:{type:Boolean,default:!1},width:{type:String,default:"84%"},padding:{type:String,default:"40rpx 30rpx"},radius:{type:String,default:"24rpx"},title:{type:String,default:""},content:{type:String,default:""},color:{type:String,default:"#999"},bgcolor:{type:String,default:"#fff"},size:{type:Number,default:28},shape:{type:String,default:"square"},button:{type:Array,default:function(){return[{text:"取消",plain:!0},{text:"确定",plain:!1}]}},maskClosable:{type:Boolean,default:!0},custom:{type:Boolean,default:!1},fadein:{type:Boolean,default:!1}},computed:{isCustomContent:function(){return!!this.$slots.customContent}},data:function(){return{}},mounted:function(){console.log(this)},methods:{handleClick:function(t){if(this.show){var e=t.currentTarget.dataset;this.$emit("click",{index:Number(e.index)})}},handleClickCancel:function(){this.maskClosable&&this.$emit("click",{index:0})}}};e.default=a},e19c:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var u=function(){var t=this,e=t.$createElement;t._self._c},i=[]},e82c:function(t,e,n){"use strict";var a=n("36e9"),u=n.n(a);u.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/plugin/modal-create-component',
     {

hdApp/dist/build/mp-weixin/components/plugin/selectList.json

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

hdApp/dist/build/mp-weixin/components/plugin/simple-address.json

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

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json

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

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json

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

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

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

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json

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

hdApp/dist/build/mp-weixin/components/plugin/tabs.json

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

hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

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

hdApp/src/admin/home/order.vue

@@ -85,12 +85,6 @@
                   >发货</div>
                 </template>
               </template>
-              <template v-if="item.payStatus == 1 && item.classify == 0">
-                <div
-                  class="admin-button-com mini"
-                  @click.stop="classifyOrder(item.id)"
-                >分类</div>
-              </template>
             </div>
           </div>
         </div>

hdApp/src/admin/home/workbench.vue

@@ -308,33 +308,42 @@ export default {
       this.$util.pageTo(item)
     },
     init () {
-      getUser().then(res => {
-        uni.setNavigationBarTitle({
-          title: res.name
+
+			/*延迟监听token*/
+			if(!uni.getStorageSync('token')){
+				setTimeout(()=>{
+					this.init();
+				},100);
+			}else{
+        getUser().then(res => {
+          uni.setNavigationBarTitle({
+            title: res.name
+          });
+
+          let nowTime = getDataTimestamp(new Date(), true);
+          if (nowTime > res.setDeadline) {
+            this.renewMask = true;
+          }
+        });
+        consoleIndex().then(res => {
+          this.data = res.data;
+          const { asset, todayData } = res.data;
+          if (!this.$util.isEmpty(asset)) {
+            // 订单总览
+            this.orderData[0].value = asset.unSendOrder;
+            this.orderData[1].value = asset.sendingOrder;
+            this.orderData[2].value = todayData.order;
+            // 总览数据
+            this.totalData[0].value = asset.totalUser;
+            this.totalData[1].value = asset.totalMember;
+            this.totalData[2].value = asset.totalVisit;
+            this.totalData[3].value = asset.totalIncome;
+            this.totalData[4].value = asset.totalExpend;
+            this.totalData[5].value = asset.remainSmsNum;
+          }
         });
+      }
 
-        let nowTime = getDataTimestamp(new Date(), true);
-        if (nowTime > res.setDeadline) {
-          this.renewMask = true;
-        }
-      });
-      consoleIndex().then(res => {
-        this.data = res.data;
-        const { asset, todayData } = res.data;
-        if (!this.$util.isEmpty(asset)) {
-          // 订单总览
-          this.orderData[0].value = asset.unSendOrder;
-          this.orderData[1].value = asset.sendingOrder;
-          this.orderData[2].value = todayData.order;
-          // 总览数据
-          this.totalData[0].value = asset.totalUser;
-          this.totalData[1].value = asset.totalMember;
-          this.totalData[2].value = asset.totalVisit;
-          this.totalData[3].value = asset.totalIncome;
-          this.totalData[4].value = asset.totalExpend;
-          this.totalData[5].value = asset.remainSmsNum;
-        }
-      });
     },
     // 跳转
     pageToFn (page) {
@@ -360,6 +369,7 @@ export default {
     },
     goToMallPt (url) {
       let self = this
+      console.log(url + '?account=' + self.loginInfo.shopId)
       getWeixinId().then(res => {
         uni.navigateToMiniProgram({
           appId: res.data.mall.miniAppId,

hdApp/src/admin/order/components/sel-express-confirm.vue

@@ -14,7 +14,6 @@
             <div class="axis-title">送达</div>
             <div class="axis-det express-wrap">
               <button class="admin-button-com big blue" @click="askConfirmReachFn">确认</button>
-              <div class="button-prompt">确认后会通知客户</div>
             </div>
           </div>
         </template>
@@ -58,12 +57,6 @@
               <block v-else>
                 <div>无配送信息</div>
               </block>
-              <block v-if="!$util.isEmpty(orderComData[2].receive)">
-                <div class="btn-wrap-com">
-                  <button class="admin-button-com default" @click="mobilePrintFn">重打</button>
-                  <button class="admin-button-com default" @click="printerSetFn">打印机</button>
-                </div>
-              </block>
             </div>
           </div>
         </template>