5 ani în urmă · 3dc859157a
--- a/ghs/dist/shop/css/chunk-05d5c311.d197c660.css
+++ b/ghs/dist/shop/css/chunk-05d5c311.d197c660.css
--- a/ghs/dist/shop/css/chunk-1056acb2.e2897626.css
+++ b/ghs/dist/shop/css/chunk-1056acb2.e2897626.css
--- a/ghs/dist/shop/css/chunk-589e98c4.016281d6.css
+++ b/ghs/dist/shop/css/chunk-589e98c4.016281d6.css
--- a/ghs/dist/shop/css/chunk-cad19e06.4b2ce381.css
+++ b/ghs/dist/shop/css/chunk-cad19e06.4b2ce381.css
--- a/ghs/dist/shop/index.html
+++ b/ghs/dist/shop/index.html
@@ -1,4 +1,4 @@
 
				-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
			
 
				+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
			
 
				 			body,
			
 
				 			#app {
			
 
				 				height: 100%;
			
@@ -43,4 +43,4 @@
 
				 			.once .sub-title {
			
 
				 				color: #ababab;
			
 
				 				font-size: 12px;
			
 
				-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.d7ce8303.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.d7ce8303.js"></script></body></html>
			
 
				+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.4f7e6f93.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.4f7e6f93.js"></script></body></html>
			
--- a/ghs/dist/shop/js/app.4f7e6f93.js
+++ b/ghs/dist/shop/js/app.4f7e6f93.js
--- a/ghs/dist/shop/js/chunk-05d5c311.c44f1809.js
+++ b/ghs/dist/shop/js/chunk-05d5c311.c44f1809.js
--- a/ghs/dist/shop/js/chunk-1056acb2.cf20e9c2.js
+++ b/ghs/dist/shop/js/chunk-1056acb2.cf20e9c2.js
--- a/ghs/dist/shop/js/chunk-3a53f8e7.48dd7a5c.js
+++ b/ghs/dist/shop/js/chunk-3a53f8e7.48dd7a5c.js
--- a/ghs/dist/shop/js/chunk-589e98c4.dc04d109.js
+++ b/ghs/dist/shop/js/chunk-589e98c4.dc04d109.js
--- a/ghs/dist/shop/js/chunk-687f3006.a3899a1d.js
+++ b/ghs/dist/shop/js/chunk-687f3006.a3899a1d.js
--- a/ghs/dist/shop/js/chunk-7f4a453c.36254a15.js
+++ b/ghs/dist/shop/js/chunk-7f4a453c.36254a15.js
--- a/ghs/dist/shop/js/chunk-7f4a453c.c68b557f.js
+++ b/ghs/dist/shop/js/chunk-7f4a453c.c68b557f.js
--- a/ghs/dist/shop/js/chunk-cad19e06.f0967672.js
+++ b/ghs/dist/shop/js/chunk-cad19e06.f0967672.js
--- a/ghs/src/cool/request/index.js
+++ b/ghs/src/cool/request/index.js
@@ -32,6 +32,7 @@ import unit from '@/service/unit/index';
 
				 import ptItem from '@/service/pt-item/index';
			
 
				 import custom from '@/service/custom/index';
			
 
				 import product from '@/service/product/index';
			
 
				+import ptItemClass from '@/service/pt-item-class/index';
			
 
				 
			
 
				 export function SET_SERVICE({ store }) {
			
 
				 	// const files = require.context('@/service/', true, /\.js$/);
			
@@ -69,7 +70,8 @@ export function SET_SERVICE({ store }) {
 
				 		unit,
			
 
				 		ptItem,
			
 
				 		custom,
			
 
				-		product
			
 
				+		product,
			
 
				+		ptItemClass
			
 
				 	};
			
 
				 
			
 
				 	Vue.prototype.$service = modules;
			
--- a/ghs/src/service/item-class/index.js
+++ b/ghs/src/service/item-class/index.js
@@ -29,5 +29,14 @@ export class ItemClassService extends BaseService {
 
				 			params: data
			
 
				 		});
			
 
				 	}
			
 
				+
			
 
				+	changeInTurn(data) {
			
 
				+		return this.request({
			
 
				+			url: '/change-in-turn',
			
 
				+            method: 'POST',
			
 
				+            data: data
			
 
				+		});
			
 
				+	}
			
 
				+
			
 
				 }
			
 
				 export default new ItemClassService();
			
--- a/ghs/src/service/pt-item-class/index.js
+++ b/ghs/src/service/pt-item-class/index.js
@@ -0,0 +1,7 @@
 
				+import { BaseService, Service } from '@/cool';
			
 
				+
			
 
				+@Service('pt-item-class')
			
 
				+export class PtItemClassService extends BaseService {
			
 
				+
			
 
				+}
			
 
				+export default new PtItemClassService();
			
--- a/ghs/src/views/item-class/list.vue
+++ b/ghs/src/views/item-class/list.vue
@@ -19,9 +19,7 @@
 
				 			</template>
			
 
				 
			
 
				 			<template #table-column-num="{scope}">
			
 
				-				<el-link
			
 
				-					@click="getItemList(scope.row)"
			
 
				-				>{{ scope.row.num }}</el-link>
			
 
				+				{{ scope.row.num }}
			
 
				 			</template>
			
 
				 
			
 
				 			<template #table-column-name="{scope}">
			
@@ -34,7 +32,6 @@
 
				 				<span v-if="!sort.status">{{ scope.row.inTurn }}</span>
			
 
				 				<el-input
			
 
				 					ref="sort-input"
			
 
				-					focus
			
 
				 					size="mini"
			
 
				 					v-else
			
 
				 					v-model="scope.row.inTurn"
			
@@ -51,11 +48,11 @@
 
				 						icon="el-icon-edit-outline"
			
 
				 						size="small"
			
 
				 						type="text"
			
 
				-						@click="showSort"
			
 
				+						@click="showSortInput"
			
 
				 						class="show"
			
 
				 					></el-button>
			
 
				 
			
 
				-					<el-button class="hide" v-else size="mini" @click="hideSort" type="primary"
			
 
				+					<el-button class="hide" v-else size="mini" @click="commitSort()" type="primary"
			
 
				 						>完成</el-button
			
 
				 					>
			
 
				 				</div>
			
@@ -129,6 +126,7 @@ export default {
 
				 			ruleForm: {
			
 
				 				name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
			
 
				 			},
			
 
				+			initData: [],
			
 
				 		};
			
 
				 	},
			
 
				 	computed: {
			
@@ -230,11 +228,7 @@ export default {
 
				 						}
			
 
				 					],
			
 
				 
			
 
				-					on: {
			
 
				-						'row-click': (row, column) => {
			
 
				-							this.getItemList(row)
			
 
				-						}
			
 
				-					},
			
 
				+					on: {},
			
 
				 
			
 
				 					op: {
			
 
				 						visible: true,
			
@@ -247,8 +241,6 @@ export default {
 
				 						layout: ['slot-item-list','slot-modify']
			
 
				 					}
			
 
				 
			
 
				-
			
 
				-
			
 
				 				})
			
 
				 				.set('dict', {
			
 
				 					search: {
			
@@ -274,32 +266,26 @@ export default {
 
				 				.done();
			
 
				 			app.refresh({ status: this.tabIndex });
			
 
				 		},
			
 
				-
			
 
				 		refresh(params) {
			
 
				 			this.app.refresh(params);
			
 
				 		},
			
 
				-
			
 
				-		showSort(e) {
			
 
				+		showSortInput(e) {
			
 
				 			this.sort.status = true;
			
 
				 		},
			
 
				-
			
 
				-		hideSort(e) {
			
 
				-			this.sort.status = false;
			
 
				+		commitSort () {
			
 
				+			let that = this
			
 
				+			this.$service.itemClass.changeInTurn({sortData:JSON.stringify(this.initData)}).then(res => {
			
 
				+				that.$message.success('保存成功！')
			
 
				+				that.sort.status = false
			
 
				+				that.refresh({status:this.tabIndex});
			
 
				+			}).catch(err => {console.log(err)})
			
 
				 		},
			
 
				-
			
 
				-		changeSort(d) {
			
 
				-			this.$service.goods
			
 
				-				.sort({
			
 
				-					inTurn: d.inTurn,
			
 
				-					id: d.id
			
 
				-				})
			
 
				-				.then(() => {
			
 
				-					this.$message.success('修改成功');
			
 
				-					this.refresh();
			
 
				-				})
			
 
				-				.catch(err => {
			
 
				-					this.$message.error(err);
			
 
				-				});
			
 
				+		changeSort (d) {
			
 
				+			let obj = {
			
 
				+				id: d.id,
			
 
				+			}
			
 
				+			obj.inTurn = d.inTurn
			
 
				+			this.initData.push(obj)
			
 
				 		}
			
 
				 	}
			
 
				 };
			
--- a/ghs/src/views/item/list.vue
+++ b/ghs/src/views/item/list.vue
@@ -28,14 +28,14 @@
 
				       
			
 
				       <template #table-column-inTurn="{scope}">
			
 
				         <span v-if="!sort.status">{{ scope.row.inTurn }}</span>
			
 
				-        <el-input style="width:50%;" ref="sort-input" focus size="mini" v-else v-model="scope.row.inTurn" @blur="changeSort(scope.row, 'inTurn')" ></el-input>
			
 
				+        <el-input style="width:50%;" ref="sort-input" focus size="mini" v-else v-model="scope.row.inTurn" @blur="changeValue(scope.row, 'inTurn')" ></el-input>
			
 
				       </template>
			
 
				 
			
 
				       <template #table-header-inTurn>
			
 
				         <div class="set-sort">
			
 
				           <span>排序</span>
			
 
				           <el-button v-if="!sort.status" icon="el-icon-edit-outline" size="small" type="text" @click="showSort" class="show"></el-button>
			
 
				-          <el-button class="hide" v-else size="mini" @click="hideSort('inTurn')" type="primary">完成</el-button>
			
 
				+          <el-button class="hide" v-else size="mini" @click="commitChange('inTurn')" type="primary">完成</el-button>
			
 
				         </div>
			
 
				       </template>
			
 
				 
			
@@ -49,48 +49,48 @@
 
				 			<div class="set-sort">
			
 
				 				<span>每扎成本价</span>
			
 
				 				<el-button v-if="!costPrice" icon="el-icon-edit-outline" size="small" type="text" @click="showCost" class="show"></el-button>
			
 
				-				<el-button class="hide" v-else size="mini" @click="hideSort('cost')" type="primary">完成</el-button>
			
 
				+				<el-button class="hide" v-else size="mini" @click="commitChange('cost')" type="primary">完成</el-button>
			
 
				 			</div>
			
 
				 		</template>
			
 
				 		<template #table-column-cost="{scope}">
			
 
				 			<span v-if="!costPrice">{{ scope.row.cost }}</span>
			
 
				-			<el-input style="width:50%;" ref="sort-input" focus size="mini" v-else v-model="scope.row.cost" @blur="changeSort(scope.row, 'cost')" ></el-input>
			
 
				+			<el-input style="width:50%;" ref="sort-input" focus size="mini" v-else v-model="scope.row.cost" @blur="changeValue(scope.row, 'cost')" ></el-input>
			
 
				 		</template>
			
 
				 		<template #table-header-addPrice="{scope}">
			
 
				 			<div class="set-sort">
			
 
				 				<span>每扎加价</span>
			
 
				 				<el-button v-if="!canAddPrice" icon="el-icon-edit-outline" size="small" type="text" @click="showAddPrice" class="show"></el-button>
			
 
				 				<el-button class="hide" v-if="canAddPrice"  size="mini" @click="changeAllSort(scope)" type="primary">批</el-button>
			
 
				-				<el-button class="hide" v-if="canAddPrice"  size="mini" @click="hideSort('addPrice')" type="primary">完成</el-button>
			
 
				+				<el-button class="hide" v-if="canAddPrice"  size="mini" @click="commitChange('addPrice')" type="primary">完成</el-button>
			
 
				 			</div>
			
 
				 		</template>
			
 
				       	<template #table-column-addPrice="{scope}">
			
 
				         <span v-if="!canAddPrice">{{ scope.row.addPrice }}</span>
			
 
				-        <el-input style="width:50%;" ref="add-price-input" focus size="mini" v-else v-model="scope.row.addPrice" @blur="changeSort(scope.row, 'addPrice')" ></el-input>
			
 
				+        <el-input style="width:50%;" ref="add-price-input" focus size="mini" v-else v-model="scope.row.addPrice" @blur="changeValue(scope.row, 'addPrice')" ></el-input>
			
 
				       </template>
			
 
				 
			
 
				 		<template #table-header-ratio="{scope}">
			
 
				 			<div class="set-sort">
			
 
				 				<span>单位比</span>
			
 
				 				<el-button v-if="!canAddRatio" icon="el-icon-edit-outline" size="small" type="text" @click="showAddRatio" class="show"></el-button>
			
 
				-				<el-button class="hide" v-if="canAddRatio"  size="mini" @click="hideSort('ratio')" type="primary">完成</el-button>
			
 
				+				<el-button class="hide" v-if="canAddRatio"  size="mini" @click="commitChange('ratio')" type="primary">完成</el-button>
			
 
				 			</div>
			
 
				 		</template>
			
 
				       	<template #table-column-ratio="{scope}">
			
 
				         <span v-if="!canAddRatio">{{ scope.row.ratio }}</span>
			
 
				-        <el-input style="width:50%;" ref="add-price-input" focus size="mini" v-else v-model="scope.row.ratio" @blur="changeSort(scope.row, 'ratio')" ></el-input>
			
 
				+        <el-input style="width:50%;" ref="add-price-input" focus size="mini" v-else v-model="scope.row.ratio" @blur="changeValue(scope.row, 'ratio')" ></el-input>
			
 
				       </template>
			
 
				 
			
 
				 	  	<template #table-header-weight>
			
 
				 		<div class="set-sort">
			
 
				 			<span>重量(公斤)</span>
			
 
				 			<el-button v-if="!costWeight" icon="el-icon-edit-outline" size="small" type="text" @click="showWeight" class="show"></el-button>
			
 
				-			<el-button class="hide" v-else size="mini" @click="hideSort('weight')" type="primary">完成</el-button>
			
 
				+			<el-button class="hide" v-else size="mini" @click="commitChange('weight')" type="primary">完成</el-button>
			
 
				 		</div>
			
 
				 	  </template>
			
 
				 		<template #table-column-weight="{scope}">
			
 
				 			<span v-if="!costWeight">{{ scope.row.weight }}</span>
			
 
				-			<el-input style="width:50%;" ref="add-price-input" focus size="mini" v-else v-model="scope.row.weight" @blur="changeSort(scope.row, 'weight')"></el-input>
			
 
				+			<el-input style="width:50%;" ref="add-price-input" focus size="mini" v-else v-model="scope.row.weight" @blur="changeValue(scope.row, 'weight')"></el-input>
			
 
				 		</template>
			
 
				 		<template #table-column-delStatus="{scope}">
			
 
				 			<span>{{ scope.row.delStatus==0?'上架':'下架' }}</span>
			
@@ -621,7 +621,7 @@ export default {
 
				 		this.costWeight = false;
			
 
				     },
			
 
				 
			
 
				-    hideSort (type) {
			
 
				+    commitChange (type) {
			
 
				       if(this.$util.isEmpty(this.initData)){
			
 
				       	switch (type) {
			
 
				 			case 'inTurn':
			
@@ -646,6 +646,7 @@ export default {
 
				       this.$service.product.productBatchUpdate(this.dataList.form).then(res => {
			
 
				         console.log(res)
			
 
				         this.$message.success('保存成功！');
			
 
				+		this.app.refresh()
			
 
				       }).catch(err => {console.log(err)})
			
 
				 		switch (type) {
			
 
				 			case 'inTurn':
			
@@ -754,48 +755,42 @@ export default {
 
				 				ele.addPrice = batchAddPrice
			
 
				 				this.initData.push({id:ele.id,addPrice:ele.addPrice})
			
 
				 			})
			
 
				-
			
 
				-
			
 
				-		  this.dialogFormVisible = false;
			
 
				-		  //   data[0].cost = 999
			
 
				+		  	this.dialogFormVisible = false;
			
 
				 	  },
			
 
				 	  //批量改价
			
 
				 	  batchAlterFun(){
			
 
				 		  if(this.batchAlter=='') return;
			
 
				 		  this.dataList.form.type = 'addPrice'
			
 
				-		  // batchAlter
			
 
				 		  let data = this.$refs['xCrud'].table.data;
			
 
				 		  data.forEach((ele)=>{
			
 
				 			  ele.addPrice = this.batchAlter
			
 
				 			  this.initData.push({id:ele.id,addPrice:this.batchAlter})
			
 
				 		  })
			
 
				 		  this.dialogFormVisible = false
			
 
				-		  // console.log(this.$refs['xCrud'].table.data,'1111');
			
 
				 	  },
			
 
				 	  changeAllSort(e){
			
 
				-		  this.batchAlter='';
			
 
				-		  this.batchAddPrice='';
			
 
				-    	this.dialogFormVisible = true;
			
 
				-
			
 
				+		this.batchAlter='';
			
 
				+		this.batchAddPrice='';
			
 
				+		this.dialogFormVisible = true;
			
 
				 	  },
			
 
				-    changeSort (d, type) {
			
 
				-      this.dataList.form.type = type
			
 
				-      let obj = {
			
 
				-        id: d.id,
			
 
				-      }
			
 
				-      if(type == 'inTurn') {
			
 
				-        obj.inTurn = d.inTurn
			
 
				-      } else if(type == 'addPrice') {
			
 
				-        obj.addPrice = d.addPrice
			
 
				-      } else if(type == 'cost') {
			
 
				-        obj.cost  = d.cost 
			
 
				-      }else if(type == 'weight') {
			
 
				-        obj.weight  = d.weight
			
 
				-      }else if(type == 'ratio') {
			
 
				-        obj.ratio  = d.ratio
			
 
				-      }
			
 
				-      this.initData.push(obj)
			
 
				-    }
			
 
				+	changeValue (d, type) {
			
 
				+		this.dataList.form.type = type
			
 
				+		let obj = {
			
 
				+			id: d.id,
			
 
				+		}
			
 
				+		if(type == 'inTurn') {
			
 
				+			obj.inTurn = d.inTurn
			
 
				+		} else if(type == 'addPrice') {
			
 
				+			obj.addPrice = d.addPrice
			
 
				+		} else if(type == 'cost') {
			
 
				+			obj.cost  = d.cost 
			
 
				+		}else if(type == 'weight') {
			
 
				+			obj.weight  = d.weight
			
 
				+		}else if(type == 'ratio') {
			
 
				+			obj.ratio  = d.ratio
			
 
				+		}
			
 
				+		this.initData.push(obj)
			
 
				+	}
			
 
				   }
			
 
				 };
			
 
				 </script>
			
--- a/ghsApp/dist/build/mp-weixin/admin/billing/index.js
+++ b/ghsApp/dist/build/mp-weixin/admin/billing/index.js
--- a/ghsApp/dist/build/mp-weixin/admin/billing/index.wxml
+++ b/ghsApp/dist/build/mp-weixin/admin/billing/index.wxml
--- a/ghsApp/dist/build/mp-weixin/admin/billing/index.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/billing/index.wxss
--- a/ghsApp/dist/build/mp-weixin/admin/ghs/shop.js
+++ b/ghsApp/dist/build/mp-weixin/admin/ghs/shop.js
--- a/ghsApp/dist/build/mp-weixin/admin/ghs/shop.wxml
+++ b/ghsApp/dist/build/mp-weixin/admin/ghs/shop.wxml
@@ -1 +1 @@
 
				-<view class="app-content _div data-v-d5686198"><view class="list-box data-v-d5686198"><block wx:if="{{!$root.g0}}"><view class="data-v-d5686198"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="flex list data-v-d5686198"><image src="{{item.avatar}}" class="data-v-d5686198"></image><view class="list-msg data-v-d5686198"><view class="data-v-d5686198">{{item.name}}</view><text class="data-v-d5686198">{{"已采购 "+item.expendAmount}}</text></view></view></block></view></block><block wx:else><block class="data-v-d5686198"><app-wrapper-empty vue-id="538898b6-1" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-d5686198" bind:__l="__l"></app-wrapper-empty></block></block></view><kd-entrance vue-id="538898b6-2" class="data-v-d5686198" bind:__l="__l"></kd-entrance></view>
			
 
				+<view class="app-content _div data-v-1df094db"><view class="list-box data-v-1df094db"><block wx:if="{{!$root.g0}}"><view class="data-v-1df094db"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="flex list data-v-1df094db"><image src="{{item.avatar}}" class="data-v-1df094db"></image><view class="list-msg data-v-1df094db"><view class="data-v-1df094db">{{item.name}}</view><text class="data-v-1df094db">{{"已采购 "+item.expendAmount}}</text></view></view></block></view></block><block wx:else><block class="data-v-1df094db"><app-wrapper-empty vue-id="538898b6-1" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-1df094db" bind:__l="__l"></app-wrapper-empty></block></block></view></view>
			
--- a/ghsApp/dist/build/mp-weixin/admin/ghs/shop.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/ghs/shop.wxss
@@ -1 +1 @@
 
				-.app-content .flex.data-v-d5686198{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.app-content .flex-center.data-v-d5686198{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.app-content .flex-space.data-v-d5686198{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}.app-content .flex-end.data-v-d5686198{display:-webkit-box;display:-webkit-flex;display: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-box.data-v-d5686198{padding:20rpx}.app-content .list-box .list.data-v-d5686198{background:#fff;padding:20rpx;margin-bottom:20rpx;border-radius:20rpx}.app-content .list-box .list image.data-v-d5686198{width:100rpx;height:100rpx;margin-right:20rpx;border-radius:50%}.app-content .list-box .list .list-msg.data-v-d5686198{line-height:1;font-size:32rpx;font-weight:700}.app-content .list-box .list .list-msg view.data-v-d5686198{margin-bottom:20rpx}.app-content .list-box .list .list-msg text.data-v-d5686198{font-size:24rpx;font-weight:500;color:#949494}
			
 
				+.app-content .flex.data-v-1df094db{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.app-content .flex-center.data-v-1df094db{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.app-content .flex-space.data-v-1df094db{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}.app-content .flex-end.data-v-1df094db{display:-webkit-box;display:-webkit-flex;display: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-box.data-v-1df094db{padding:20rpx}.app-content .list-box .list.data-v-1df094db{background:#fff;padding:20rpx;margin-bottom:20rpx;border-radius:20rpx}.app-content .list-box .list image.data-v-1df094db{width:100rpx;height:100rpx;margin-right:20rpx;border-radius:50%}.app-content .list-box .list .list-msg.data-v-1df094db{line-height:1;font-size:32rpx;font-weight:700}.app-content .list-box .list .list-msg view.data-v-1df094db{margin-bottom:20rpx}.app-content .list-box .list .list-msg text.data-v-1df094db{font-size:24rpx;font-weight:500;color:#949494}
			
--- a/ghsApp/dist/build/mp-weixin/admin/home/apply.js
+++ b/ghsApp/dist/build/mp-weixin/admin/home/apply.js
--- a/ghsApp/dist/build/mp-weixin/admin/home/apply.wxml
+++ b/ghsApp/dist/build/mp-weixin/admin/home/apply.wxml
@@ -1 +1 @@
 
				-<view class="app-content data-v-be6c55b4"><view class="apply-content_box data-v-be6c55b4"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-be6c55b4"><view class="tit data-v-be6c55b4">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-be6c55b4"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-be6c55b4"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-be6c55b4"><view class="tabs-img _div data-v-be6c55b4"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-be6c55b4"></image></view><view class="tabs-name _div data-v-be6c55b4">{{s.name}}</view></view></view></block></view></view></block></view><kd-entrance vue-id="23de2e0c-1" class="data-v-be6c55b4" bind:__l="__l"></kd-entrance></view>
			
 
				+<view class="app-content data-v-b4b7584e"><view class="apply-content_box data-v-b4b7584e"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-b4b7584e"><view class="tit data-v-b4b7584e">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-b4b7584e"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-b4b7584e"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-b4b7584e"><view class="tabs-img _div data-v-b4b7584e"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-b4b7584e"></image></view><view class="tabs-name _div data-v-b4b7584e">{{s.name}}</view></view></view></block></view></view></block></view></view>
			
--- a/ghsApp/dist/build/mp-weixin/admin/home/apply.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/home/apply.wxss
@@ -1 +1 @@
 
				-.apply-content_box.data-v-be6c55b4{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-be6c55b4{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-be6c55b4{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-be6c55b4{padding:40rpx 0rpx;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}.apply-content_box .tabs-wrap .tabs-list.data-v-be6c55b4{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-be6c55b4{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-be6c55b4{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-be6c55b4{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-be6c55b4:nth-child(-n + 4){margin-top:0}
			
 
				+.apply-content_box.data-v-b4b7584e{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-b4b7584e{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-b4b7584e{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-b4b7584e{padding:40rpx 0rpx;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}.apply-content_box .tabs-wrap .tabs-list.data-v-b4b7584e{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-b4b7584e{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-b4b7584e{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-b4b7584e{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-b4b7584e:nth-child(-n + 4){margin-top:0}
			
--- a/ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json
+++ b/ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
+++ b/ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/admin/home/me.js
+++ b/ghsApp/dist/build/mp-weixin/admin/home/me.js
--- a/ghsApp/dist/build/mp-weixin/admin/home/me.wxml
+++ b/ghsApp/dist/build/mp-weixin/admin/home/me.wxml
--- a/ghsApp/dist/build/mp-weixin/admin/home/me.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/home/me.wxss
--- a/ghsApp/dist/build/mp-weixin/admin/shopAdmin/bind.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/shopAdmin/bind.wxss
@@ -0,0 +1 @@
 
				+/* admin/shopAdmin/bind.wxss */
			
--- a/ghsApp/dist/build/mp-weixin/admin/staff/achieve.js
+++ b/ghsApp/dist/build/mp-weixin/admin/staff/achieve.js
--- a/ghsApp/dist/build/mp-weixin/admin/staff/achieve.wxml
+++ b/ghsApp/dist/build/mp-weixin/admin/staff/achieve.wxml
--- a/ghsApp/dist/build/mp-weixin/admin/staff/achieve.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/staff/achieve.wxss
--- a/ghsApp/dist/build/mp-weixin/admin/staff/sel-member.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/staff/sel-member.wxss
@@ -0,0 +1 @@
 
				+/* admin/staff/sel-member.wxss */
			
--- a/ghsApp/dist/build/mp-weixin/admin/statistics/demo.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/statistics/demo.wxss
@@ -0,0 +1 @@
 
				+/* admin/statistics/demo.wxss */
			
--- a/ghsApp/dist/build/mp-weixin/common/main.wxss
+++ b/ghsApp/dist/build/mp-weixin/common/main.wxss
--- a/ghsApp/dist/build/mp-weixin/common/runtime.js
+++ b/ghsApp/dist/build/mp-weixin/common/runtime.js
--- a/ghsApp/dist/build/mp-weixin/common/vendor.js
+++ b/ghsApp/dist/build/mp-weixin/common/vendor.js
--- a/ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
+++ b/ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/app-date-picker.js
+++ b/ghsApp/dist/build/mp-weixin/components/app-date-picker.js
@@ -1,4 +1,4 @@
 
				-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/app-date-picker"],{"2f8d":function(t,e,a){"use strict";a.r(e);var n=a("2fbe"),r=a("a382");for(var u in r)["default"].indexOf(u)<0&&function(t){a.d(e,t,(function(){return r[t]}))}(u);var i,c=a("0095"),d=Object(c["a"])(r["default"],n["b"],n["c"],!1,null,"4998f8d1",null,!1,n["a"],i);e["default"]=d.exports},"2fbe":function(t,e,a){"use strict";var n;a.d(e,"b",(function(){return r})),a.d(e,"c",(function(){return u})),a.d(e,"a",(function(){return n}));var r=function(){var t=this,e=t.$createElement;t._self._c},u=[]},9570:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"app-date-picker",props:{mode:{type:String,default:"date"},placeholder:{type:String,default:null},dateVal:{type:String,default:""},startDate:{type:String,default:""},endDate:{type:String,default:""}},data:function(){return{date:null}},watch:{dateVal:function(t){this.date=t}},computed:{startDate2:function(){return console.log(this.getDate("start")),this.getDate("start")},endDate2:function(){return this.getDate("end")}},methods:{bindDateChange:function(t){var e=t.target.value;this.date=e,console.log(e),this.$emit("update:dateVal",e),this.$emit("change",e)},getDate:function(t){var e=new Date,a=e.getFullYear(),n=e.getMonth()+1,r=e.getDate();return"start"===t?a=this.startDate:"end"===t&&(a=this.endDate),n=n>9?n:"0"+n,r=r>9?r:"0"+r,"".concat(a,"-").concat(n,"-").concat(r)}}};e.default=n},a382:function(t,e,a){"use strict";a.r(e);var n=a("9570"),r=a.n(n);for(var u in n)["default"].indexOf(u)<0&&function(t){a.d(e,t,(function(){return n[t]}))}(u);e["default"]=r.a}}]);
			
 
				+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/app-date-picker"],{"155c":function(t,e,a){"use strict";var n=a("2a14"),r=a.n(n);r.a},"2a14":function(t,e,a){},"2f8d":function(t,e,a){"use strict";a.r(e);var n=a("4bfe"),r=a("a382");for(var u in r)["default"].indexOf(u)<0&&function(t){a.d(e,t,(function(){return r[t]}))}(u);a("155c");var c,i=a("0095"),o=Object(i["a"])(r["default"],n["b"],n["c"],!1,null,"27a4c0d6",null,!1,n["a"],c);e["default"]=o.exports},"4bfe":function(t,e,a){"use strict";var n;a.d(e,"b",(function(){return r})),a.d(e,"c",(function(){return u})),a.d(e,"a",(function(){return n}));var r=function(){var t=this,e=t.$createElement;t._self._c},u=[]},9570:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"app-date-picker",props:{mode:{type:String,default:"date"},placeholder:{type:String,default:null},dateVal:{type:String,default:""},startDate:{type:String,default:""},endDate:{type:String,default:""}},data:function(){return{date:null}},watch:{dateVal:function(t){this.date=t}},computed:{startDate2:function(){return console.log(this.getDate("start")),this.getDate("start")},endDate2:function(){return this.getDate("end")}},methods:{bindDateChange:function(t){var e=t.target.value;this.date=e,console.log(e),this.$emit("update:dateVal",e),this.$emit("change",e)},getDate:function(t){var e=new Date,a=e.getFullYear(),n=e.getMonth()+1,r=e.getDate();return"start"===t?a=this.startDate:"end"===t&&(a=this.endDate),n=n>9?n:"0"+n,r=r>9?r:"0"+r,"".concat(a,"-").concat(n,"-").concat(r)}}};e.default=n},a382:function(t,e,a){"use strict";a.r(e);var n=a("9570"),r=a.n(n);for(var u in n)["default"].indexOf(u)<0&&function(t){a.d(e,t,(function(){return n[t]}))}(u);e["default"]=r.a}}]);
			
 
				 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
			
 
				     'components/app-date-picker-create-component',
			
 
				     {
			
--- a/ghsApp/dist/build/mp-weixin/components/app-date-picker.wxml
+++ b/ghsApp/dist/build/mp-weixin/components/app-date-picker.wxml
@@ -1 +1 @@
 
				-<view class="data-v-4998f8d1"><picker mode="{{mode}}" value="{{date}}" start="{{startDate2}}" end="{{endDate2}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e" class="data-v-4998f8d1"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="uni-input data-v-4998f8d1"><block wx:if="{{placeholder&&!date}}"><label style="color:#ccc;" class="_span data-v-4998f8d1">{{placeholder}}</label></block><block wx:else><label class="_span data-v-4998f8d1">{{date}}</label></block><label class="_span data-v-4998f8d1"></label></view></block></picker></view>
			
 
				+<view class="data-v-27a4c0d6"><picker mode="{{mode}}" value="{{date}}" start="{{startDate2}}" end="{{endDate2}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e" class="data-v-27a4c0d6"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="uni-input data-v-27a4c0d6"><block wx:if="{{placeholder&&!date}}"><label style="color:#ccc;" class="_span data-v-27a4c0d6">{{placeholder}}</label></block><block wx:else><label class="_span data-v-27a4c0d6">{{date}}</label></block><label class="_span data-v-27a4c0d6"></label></view></block></picker></view>
			
--- a/ghsApp/dist/build/mp-weixin/components/app-date-picker.wxss
+++ b/ghsApp/dist/build/mp-weixin/components/app-date-picker.wxss
@@ -0,0 +1 @@
 
				+.uni-input.data-v-27a4c0d6{width:420rpx;height:50rpx;padding-top:5rpx}
			
--- a/ghsApp/dist/build/mp-weixin/components/app-img.json
+++ b/ghsApp/dist/build/mp-weixin/components/app-img.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/app-result.json
+++ b/ghsApp/dist/build/mp-weixin/components/app-result.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
+++ b/ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/module/app-commodity.js
+++ b/ghsApp/dist/build/mp-weixin/components/module/app-commodity.js
--- a/ghsApp/dist/build/mp-weixin/components/module/app-commodity.wxml
+++ b/ghsApp/dist/build/mp-weixin/components/module/app-commodity.wxml
--- a/ghsApp/dist/build/mp-weixin/components/module/app-commodity.wxss
+++ b/ghsApp/dist/build/mp-weixin/components/module/app-commodity.wxss
--- a/ghsApp/dist/build/mp-weixin/components/module/app-search.json
+++ b/ghsApp/dist/build/mp-weixin/components/module/app-search.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/w-picker/w-picker.js
+++ b/ghsApp/dist/build/mp-weixin/components/w-picker/w-picker.js
--- a/ghsApp/dist/build/mp-weixin/ext.json
+++ b/ghsApp/dist/build/mp-weixin/ext.json
@@ -1,12 +1,12 @@
 
				 {
			
 
				   "extEnable": true,
			
 
				-  "extAppid": "wxcf32b3f0684c2433",
			
 
				+  "extAppid": "wx21b7c3ef12082099",
			
 
				   "directCommit": false,
			
 
				   "ext": {
			
 
				-    "account": 12358,
			
 
				-    "apiHost": "https://api.shop.wixhb.com",
			
 
				-    "socketApiHost": "api.shop.wixhb.com",
			
 
				-    "imgHost": "https://img.wixhb.com",
			
 
				-    "name":"销花宝"
			
 
				+    "account": 12362,
			
 
				+    "apiHost": "https://api.shop.hzghd.com",
			
 
				+    "socketApiHost": "api.shop.hzghd.com",
			
 
				+    "imgHost": "https://img.hzghd.com",
			
 
				+    "name":"花掌柜"
			
 
				   }
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/pagesInvite/list.js
+++ b/ghsApp/dist/build/mp-weixin/pagesInvite/list.js
--- a/ghsApp/dist/build/mp-weixin/pagesInvite/list.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesInvite/list.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesInvite/list.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesInvite/list.wxss
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/detail.js
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/detail.js
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxss
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/refund.js
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/refund.js
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/refund.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/refund.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/refund.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/refund.wxss
@@ -1 +1 @@
 
				-.app-content.data-v-b89d66e2{height:calc(100vh - 30rpx * 2);padding:30rpx;background:#fff}.app-content .radioBtn.data-v-b89d66e2{width:30rpx;height:30rpx;margin-right:10rpx;border:1rpx solid #ddd;border-radius:50%}.app-content .radioBtn.active.data-v-b89d66e2{position:relative;border:1rpx solid #3385ff}.app-content .radioBtn.active.data-v-b89d66e2:after{content:"";position:absolute;width:18rpx;height:18rpx;background:#3385ff;border-radius:50%}.app-content .refund-item-list.data-v-b89d66e2{display:-webkit-box;display:-webkit-flex;display:flex;padding-bottom:30rpx;border-bottom:1rpx solid #ddd}.app-content .refund-item-list .refund-label.data-v-b89d66e2{width:200rpx}.app-content .refund-item-list .refund-label text.data-v-b89d66e2{color:red}.app-content .refund-item-list .list.data-v-b89d66e2{margin-bottom:10rpx}.app-content .refund-item-list .list .list-title.data-v-b89d66e2{height:60rpx;padding-bottom:20rpx}.app-content .refund-item-list .list .list-val input.data-v-b89d66e2{width:150rpx;border:1rpx solid #ddd}.app-content .refund-item-list .list .list-val text.data-v-b89d66e2{padding:0 30rpx}.app-content .refund-item.data-v-b89d66e2{display:-webkit-box;display:-webkit-flex;display:flex;padding:30rpx 0}.app-content .refund-item .refund-label.data-v-b89d66e2{width:200rpx}.app-content .refund-item .refund-label text.data-v-b89d66e2{color:red}.app-content .refund-item input.data-v-b89d66e2{border:1rpx solid #ddd}.app-content .refund-item textarea.data-v-b89d66e2{width:calc(100% - 210rpx);border:1rpx solid #ddd}.app-content .btn-box .btn.data-v-b89d66e2{width:200rpx;height:60rpx;border:1rpx solid #666;border-radius:10rpx}.app-content .btn-box .btn.active.data-v-b89d66e2{background:#3385ff;color:#fff;border:1rpx solid #3385ff}
			
 
				+.app-content.data-v-222cc9f3{height:calc(100vh - 30rpx * 2);padding:30rpx;background:#fff;font-size:30rpx}.app-content .radioBtn.data-v-222cc9f3{width:30rpx;height:30rpx;margin-right:10rpx;border:1rpx solid #ddd;border-radius:50%}.app-content .radioBtn.active.data-v-222cc9f3{position:relative;border:1rpx solid #3385ff}.app-content .radioBtn.active.data-v-222cc9f3:after{content:"";position:absolute;width:18rpx;height:18rpx;background:#3385ff;border-radius:50%}.app-content .refund-item-list.data-v-222cc9f3{display:-webkit-box;display:-webkit-flex;display:flex;padding-bottom:30rpx;border-bottom:1rpx solid #ddd}.app-content .refund-item-list .refund-label.data-v-222cc9f3{width:200rpx}.app-content .refund-item-list .refund-label text.data-v-222cc9f3{color:red}.app-content .refund-item-list .list.data-v-222cc9f3{margin-bottom:10rpx}.app-content .refund-item-list .list .list-title.data-v-222cc9f3{height:60rpx;padding-bottom:20rpx}.app-content .refund-item-list .list .list-val input.data-v-222cc9f3{width:150rpx;border:1rpx solid #ddd}.app-content .refund-item-list .list .list-val text.data-v-222cc9f3{padding:0 30rpx}.app-content .refund-item.data-v-222cc9f3{display:-webkit-box;display:-webkit-flex;display:flex;padding:30rpx 0}.app-content .refund-item .refund-label.data-v-222cc9f3{width:200rpx}.app-content .refund-item .refund-label text.data-v-222cc9f3{color:red}.app-content .refund-item input.data-v-222cc9f3{border:1rpx solid #ddd}.app-content .refund-item textarea.data-v-222cc9f3{width:calc(100% - 210rpx);border:1rpx solid #ddd}.app-content .btn-box .btn.data-v-222cc9f3{width:200rpx;height:60rpx;border:1rpx solid #666;border-radius:10rpx}.app-content .btn-box .btn.active.data-v-222cc9f3{background:#3385ff;color:#fff;border:1rpx solid #3385ff}
			
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/refundMsg.js
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/refundMsg.js
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/refundMsg.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/refundMsg.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/refundMsg.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/refundMsg.wxss
@@ -1 +1 @@
 
				-.app-content.data-v-634785db{height:calc(100vh - 30rpx * 2);padding:30rpx;background:#fff}.app-content .radioBtn.data-v-634785db{width:30rpx;height:30rpx;margin-right:10rpx;border:1rpx solid #ddd;border-radius:50%}.app-content .radioBtn.active.data-v-634785db{position:relative;border:1rpx solid #3385ff}.app-content .radioBtn.active.data-v-634785db:after{content:"";position:absolute;width:18rpx;height:18rpx;background:#3385ff;border-radius:50%}.app-content .refund-item-list.data-v-634785db{display:-webkit-box;display:-webkit-flex;display:flex;padding-bottom:30rpx;border-bottom:1rpx solid #ddd}.app-content .refund-item-list .refund-label.data-v-634785db{width:200rpx}.app-content .refund-item-list .refund-label text.data-v-634785db{color:red}.app-content .refund-item-list .list.data-v-634785db{margin-bottom:10rpx}.app-content .refund-item-list .list .list-title.data-v-634785db{height:60rpx;padding-bottom:20rpx}.app-content .refund-item-list .list .list-val input.data-v-634785db{width:150rpx;border:1rpx solid #ddd}.app-content .refund-item-list .list .list-val text.data-v-634785db{padding:0 30rpx}.app-content .refund-item.data-v-634785db{display:-webkit-box;display:-webkit-flex;display:flex;padding:30rpx 0}.app-content .refund-item .refund-label.data-v-634785db{width:200rpx}.app-content .refund-item .refund-label text.data-v-634785db{color:red}.app-content .refund-item input.data-v-634785db{border:1rpx solid #ddd}.app-content .refund-item textarea.data-v-634785db{width:calc(100% - 210rpx);border:1rpx solid #ddd}.app-content .btn-box .btn.data-v-634785db{width:200rpx;height:60rpx;border:1rpx solid #666;border-radius:10rpx}.app-content .btn-box .btn.active.data-v-634785db{background:#3385ff;color:#fff;border:1rpx solid #3385ff}
			
 
				+.app-content.data-v-6a93341a{height:calc(100vh - 30rpx * 2);padding:30rpx;background:#fff}.app-content .radioBtn.data-v-6a93341a{width:30rpx;height:30rpx;margin-right:10rpx;border:1rpx solid #ddd;border-radius:50%}.app-content .radioBtn.active.data-v-6a93341a{position:relative;border:1rpx solid #3385ff}.app-content .radioBtn.active.data-v-6a93341a:after{content:"";position:absolute;width:18rpx;height:18rpx;background:#3385ff;border-radius:50%}.app-content .refund-item-list.data-v-6a93341a{display:-webkit-box;display:-webkit-flex;display:flex;padding-bottom:30rpx;border-bottom:1rpx solid #ddd}.app-content .refund-item-list .refund-label.data-v-6a93341a{width:200rpx}.app-content .refund-item-list .refund-label text.data-v-6a93341a{color:red}.app-content .refund-item-list .list.data-v-6a93341a{margin-bottom:10rpx}.app-content .refund-item-list .list .list-title.data-v-6a93341a{height:60rpx;padding-bottom:20rpx}.app-content .refund-item-list .list .list-val input.data-v-6a93341a{width:150rpx;border:1rpx solid #ddd}.app-content .refund-item-list .list .list-val text.data-v-6a93341a{padding:0 30rpx}.app-content .refund-item.data-v-6a93341a{display:-webkit-box;display:-webkit-flex;display:flex;padding:30rpx 0}.app-content .refund-item .refund-label.data-v-6a93341a{width:200rpx}.app-content .refund-item .refund-label text.data-v-6a93341a{color:red}.app-content .refund-item input.data-v-6a93341a{border:1rpx solid #ddd}.app-content .refund-item textarea.data-v-6a93341a{width:calc(100% - 210rpx);border:1rpx solid #ddd}.app-content .btn-box .btn.data-v-6a93341a{width:200rpx;height:60rpx;border:1rpx solid #666;border-radius:10rpx}.app-content .btn-box .btn.active.data-v-6a93341a{background:#3385ff;color:#fff;border:1rpx solid #3385ff}
			
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/select.js
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/select.js
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/select.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/select.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/select.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/select.wxss
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/ship.js
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/ship.js
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/ship.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/ship.wxml
@@ -1 +1 @@
 
				-<view class="app-content data-v-057e3573"><view class="order-info_box data-v-057e3573"><view class="order-info-list data-v-057e3573"><view class="list-item data-v-057e3573"><text class="data-v-057e3573">订单号</text><text class="data-v-057e3573">{{orderInfo.orderSn}}</text></view><view class="list-item data-v-057e3573"><text class="data-v-057e3573">下单时间</text><text class="data-v-057e3573">{{orderInfo.addTime}}</text></view><view class="list-item data-v-057e3573"><text class="data-v-057e3573">金额</text><text class="data-v-057e3573">{{orderInfo.actPrice}}</text></view></view><image src="/static/images/default-img.png" mode="scaleToFill" class="data-v-057e3573"></image></view><view class="step-content_box data-v-057e3573"><step-ship vue-id="05200bc3-1" orderComData="{{orderComData}}" orderInfo="{{orderInfo}}" 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-057e3573" 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-057e3573" bind:__l="__l"></modal-module><kd-entrance vue-id="05200bc3-3" class="data-v-057e3573" bind:__l="__l"></kd-entrance></view>
			
 
				+<view class="app-content data-v-1d8356cc"><view class="order-info_box data-v-1d8356cc"><view class="order-info-list data-v-1d8356cc"><view class="list-item data-v-1d8356cc"><text class="data-v-1d8356cc">订单号</text><text class="data-v-1d8356cc">{{orderInfo.orderSn}}</text></view><view class="list-item data-v-1d8356cc"><text class="data-v-1d8356cc">下单时间</text><text class="data-v-1d8356cc">{{orderInfo.addTime}}</text></view><view class="list-item data-v-1d8356cc"><text class="data-v-1d8356cc">金额</text><text class="data-v-1d8356cc">{{orderInfo.actPrice}}</text></view></view><image src="/static/images/default-img.png" mode="scaleToFill" class="data-v-1d8356cc"></image></view><view class="step-content_box data-v-1d8356cc"><step-ship vue-id="05200bc3-1" orderComData="{{orderComData}}" orderInfo="{{orderInfo}}" 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-1d8356cc" 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-1d8356cc" bind:__l="__l"></modal-module></view>
			
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/ship.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/ship.wxss
@@ -1 +1 @@
 
				-.app-content .ship-modal .line-label.data-v-057e3573{width:140rpx}.order-info_box.data-v-057e3573{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-057e3573{-webkit-box-flex:1;-webkit-flex:1;flex:1}.order-info_box .order-info-list .list-item.data-v-057e3573{font-size:28rpx;font-weight:400}.order-info_box .order-info-list .list-item > text.data-v-057e3573:nth-child(1){color:#666;display:inline-block;width:140rpx}.order-info_box .order-info-list .list-item > text.data-v-057e3573:nth-child(1){color:#333}.order-info_box image.data-v-057e3573{width:146rpx;height:146rpx}.order-fa_box.data-v-057e3573{padding:20rpx;border:1rpx solid #ddd;border-radius:4rpx;margin-bottom:20rpx}.order-fa_box > .order-fa_info.data-v-057e3573{padding-left:20rpx}.order-fa_box > .order-fa_info > .order-fa_top.data-v-057e3573{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-057e3573: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-057e3573:nth-child(2){color:#333;font-size:32rpx;font-weight:600;color:#333}.order-fa_box > .order-fa_info > view.data-v-057e3573: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-057e3573: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-1d8356cc{width:140rpx}.order-info_box.data-v-1d8356cc{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-1d8356cc{-webkit-box-flex:1;-webkit-flex:1;flex:1}.order-info_box .order-info-list .list-item.data-v-1d8356cc{font-size:28rpx;font-weight:400}.order-info_box .order-info-list .list-item > text.data-v-1d8356cc:nth-child(1){color:#666;display:inline-block;width:140rpx}.order-info_box .order-info-list .list-item > text.data-v-1d8356cc:nth-child(1){color:#333}.order-info_box image.data-v-1d8356cc{width:146rpx;height:146rpx}.order-fa_box.data-v-1d8356cc{padding:20rpx;border:1rpx solid #ddd;border-radius:4rpx;margin-bottom:20rpx}.order-fa_box > .order-fa_info.data-v-1d8356cc{padding-left:20rpx}.order-fa_box > .order-fa_info > .order-fa_top.data-v-1d8356cc{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-1d8356cc: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-1d8356cc:nth-child(2){color:#333;font-size:32rpx;font-weight:600;color:#333}.order-fa_box > .order-fa_info > view.data-v-1d8356cc: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-1d8356cc:nth-child(3){padding-left:60rpx;text-align:left;color:#333;font-size:24rpx;font-weight:400;margin:25rpx 0 19rpx}
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/cashSet.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/cashSet.js
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/cashSet.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/cashSet.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/cashSet.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/cashSet.wxss
@@ -1 +1 @@
 
				-.app-content.data-v-9e30b1f4{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-9e30b1f4{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-9e30b1f4{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-9e30b1f4{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-9e30b1f4{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-9e30b1f4{height:240rpx}.confirm-btn.data-v-9e30b1f4{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-9e30b1f4{width:100%}
			
 
				+.app-content.data-v-e0753abc{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-e0753abc{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-e0753abc{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-e0753abc{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-e0753abc{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-e0753abc{height:240rpx}.confirm-btn.data-v-e0753abc{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-e0753abc{width:100%}
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/expressSet.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/expressSet.js
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/expressSet.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/expressSet.wxml
@@ -1 +1 @@
 
				-<view class="app-content _div data-v-4050bb76"><view hidden="{{!(showStaffArea)}}" class="_div data-v-4050bb76"><form data-event-opts="{{[['submit',[['formSubmit',['$event']]]],['reset',[['formReset',['$event']]]]]}}" bindsubmit="__e" bindreset="__e" class="data-v-4050bb76"><view class="module-com input-line-wrap _div data-v-4050bb76"><tui-list-cell class="line-cell data-v-4050bb76" vue-id="30009b01-1" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-4050bb76">达达商户ID</view><input class="tui-input data-v-4050bb76" placeholder-class="phcolor" name="sjId" placeholder="请输入商户ID" maxlength="50" type="text" data-event-opts="{{[['input',[['__set_model',['$0','sjId','$event',[]],['form']]]]]}}" value="{{form.sjId}}" bindinput="__e"/></tui-list-cell><tui-list-cell class="line-cell data-v-4050bb76" vue-id="30009b01-2" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-4050bb76">达达门店编号</view><input class="tui-input data-v-4050bb76" placeholder-class="phcolor" name="shopNo" placeholder="请输入编号" maxlength="50" type="text" data-event-opts="{{[['input',[['__set_model',['$0','shopNo','$event',[]],['form']]]]]}}" value="{{form.shopNo}}" bindinput="__e"/></tui-list-cell><view style="padding:20rpx 0 0 30rpx;color:#CCCCCC;" class="_div data-v-4050bb76">设置完成后请联系管理员进行授权</view></view><view class="confirm-btn _div data-v-4050bb76"><button class="admin-button-com big blue data-v-4050bb76" formType="submit">提交</button></view></form></view><kd-entrance vue-id="30009b01-3" class="data-v-4050bb76" bind:__l="__l"></kd-entrance></view>
			
 
				+<view class="app-content _div data-v-04c7c4f4"><view hidden="{{!(showStaffArea)}}" class="_div data-v-04c7c4f4"><form data-event-opts="{{[['submit',[['formSubmit',['$event']]]],['reset',[['formReset',['$event']]]]]}}" bindsubmit="__e" bindreset="__e" class="data-v-04c7c4f4"><view class="module-com input-line-wrap _div data-v-04c7c4f4"><tui-list-cell class="line-cell data-v-04c7c4f4" vue-id="30009b01-1" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-04c7c4f4">达达商户ID</view><input class="tui-input data-v-04c7c4f4" placeholder-class="phcolor" name="sjId" placeholder="请输入商户ID" maxlength="50" type="text" data-event-opts="{{[['input',[['__set_model',['$0','sjId','$event',[]],['form']]]]]}}" value="{{form.sjId}}" bindinput="__e"/></tui-list-cell><tui-list-cell class="line-cell data-v-04c7c4f4" vue-id="30009b01-2" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-04c7c4f4">达达门店编号</view><input class="tui-input data-v-04c7c4f4" placeholder-class="phcolor" name="shopNo" placeholder="请输入编号" maxlength="50" type="text" data-event-opts="{{[['input',[['__set_model',['$0','shopNo','$event',[]],['form']]]]]}}" value="{{form.shopNo}}" bindinput="__e"/></tui-list-cell><view style="padding:20rpx 0 0 30rpx;color:#CCCCCC;" class="_div data-v-04c7c4f4">设置完成后请联系管理员进行授权</view></view><view class="confirm-btn _div data-v-04c7c4f4"><button class="admin-button-com big blue data-v-04c7c4f4" formType="submit">提交</button></view></form></view></view>
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/expressSet.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/expressSet.wxss
@@ -1 +1 @@
 
				-.app-content.data-v-4050bb76{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-4050bb76{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-4050bb76{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-4050bb76{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-4050bb76{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-4050bb76{height:240rpx}.confirm-btn.data-v-4050bb76{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-4050bb76{width:100%}
			
 
				+.app-content.data-v-04c7c4f4{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-04c7c4f4{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-04c7c4f4{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-04c7c4f4{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-04c7c4f4{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-04c7c4f4{height:240rpx}.confirm-btn.data-v-04c7c4f4{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-04c7c4f4{width:100%}
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/incomeExpenses.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/incomeExpenses.js
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/incomeExpenses.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/incomeExpenses.wxml
@@ -1 +1 @@
 
				-<view class="_div data-v-602ecf70"><app-tabs vue-id="4a4feaa2-1" tabs="{{tabs}}" isFixed="{{true}}" currentTab="{{tabIndex}}" height="{{100}}" itemWidth="50%" data-event-opts="{{[['^change',[['changeIncome']]]]}}" bind:change="__e" class="data-v-602ecf70" bind:__l="__l"></app-tabs><block wx:if="{{!$root.g0}}"><view class="list-by_box _div data-v-602ecf70"><t-table vue-id="4a4feaa2-2" headerBackgroundColor="#F0F2F6" class="data-v-602ecf70" bind:__l="__l" vue-slots="{{['default']}}"><t-tr vue-id="{{('4a4feaa2-3')+','+('4a4feaa2-2')}}" header="{{true}}" class="data-v-602ecf70" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-th vue-id="{{('4a4feaa2-4-'+index)+','+('4a4feaa2-3')}}" align="{{item.align}}" class="data-v-602ecf70" bind:__l="__l" vue-slots="{{['default']}}">{{''+item.name+''}}</t-th></block></t-tr><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-tr vue-id="{{('4a4feaa2-5-'+index)+','+('4a4feaa2-2')}}" class="data-v-602ecf70" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="column" wx:for-index="colIndex" wx:key="colIndex"><t-td vue-id="{{('4a4feaa2-6-'+index+'-'+colIndex)+','+('4a4feaa2-5-'+index)}}" align="{{column.align}}" color="{{column.color}}" class="data-v-602ecf70" bind:__l="__l" vue-slots="{{['default']}}"><view class="data-v-602ecf70">{{''+(item[column.dataIndex]||"")+''}}</view></t-td></block></t-tr></block></t-table></view></block><block wx:else><block class="data-v-602ecf70"><app-wrapper-empty vue-id="4a4feaa2-7" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-602ecf70" bind:__l="__l"></app-wrapper-empty></block></block><kd-entrance vue-id="4a4feaa2-8" class="data-v-602ecf70" bind:__l="__l"></kd-entrance></view>
			
 
				+<view class="_div data-v-08eb3a19"><app-tabs vue-id="4a4feaa2-1" tabs="{{tabs}}" isFixed="{{true}}" currentTab="{{tabIndex}}" height="{{100}}" itemWidth="50%" data-event-opts="{{[['^change',[['changeIncome']]]]}}" bind:change="__e" class="data-v-08eb3a19" bind:__l="__l"></app-tabs><block wx:if="{{!$root.g0}}"><view class="list-by_box _div data-v-08eb3a19"><t-table vue-id="4a4feaa2-2" headerBackgroundColor="#F0F2F6" class="data-v-08eb3a19" bind:__l="__l" vue-slots="{{['default']}}"><t-tr vue-id="{{('4a4feaa2-3')+','+('4a4feaa2-2')}}" header="{{true}}" class="data-v-08eb3a19" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-th vue-id="{{('4a4feaa2-4-'+index)+','+('4a4feaa2-3')}}" align="{{item.align}}" class="data-v-08eb3a19" bind:__l="__l" vue-slots="{{['default']}}">{{''+item.name+''}}</t-th></block></t-tr><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-tr vue-id="{{('4a4feaa2-5-'+index)+','+('4a4feaa2-2')}}" class="data-v-08eb3a19" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="column" wx:for-index="colIndex" wx:key="colIndex"><t-td vue-id="{{('4a4feaa2-6-'+index+'-'+colIndex)+','+('4a4feaa2-5-'+index)}}" align="{{column.align}}" color="{{column.color}}" class="data-v-08eb3a19" bind:__l="__l" vue-slots="{{['default']}}"><view class="data-v-08eb3a19">{{''+(item[column.dataIndex]||"")+''}}</view></t-td></block></t-tr></block></t-table></view></block><block wx:else><block class="data-v-08eb3a19"><app-wrapper-empty vue-id="4a4feaa2-7" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-08eb3a19" bind:__l="__l"></app-wrapper-empty></block></block></view>
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/incomeExpenses.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/incomeExpenses.wxss
@@ -1 +1 @@
 
				-.list-by_box.data-v-602ecf70{padding-top:100rpx}
			
 
				+.list-by_box.data-v-08eb3a19{padding-top:100rpx}
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/recharge.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/recharge.js
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/recharge.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/recharge.wxml
@@ -1 +1 @@
 
				-<view class="data-v-791c599b"><view class="recharge_title data-v-791c599b">充值金额</view><view class="data-v-791c599b"><view class="amount_area data-v-791c599b"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="{{['amount string left data-v-791c599b',amount==5000?'selected':'']}}" bindtap="__e">¥5000</view><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="{{['amount string middle data-v-791c599b',amount==1000?'selected':'']}}" bindtap="__e">¥1000</view><view data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" class="{{['amount string data-v-791c599b',amount==800?'selected':'']}}" bindtap="__e">¥800</view></view><view class="amount_area data-v-791c599b"><view data-event-opts="{{[['tap',[['e3',['$event']]]]]}}" class="{{['amount string left data-v-791c599b',amount==500?'selected':'']}}" bindtap="__e">¥500</view><view data-event-opts="{{[['tap',[['e4',['$event']]]]]}}" class="{{['amount string middle data-v-791c599b',amount==100?'selected':'']}}" bindtap="__e">¥100</view><view class="amount data-v-791c599b"><input class="other_amount data-v-791c599b" type="digit" placeholder="其它金额" data-event-opts="{{[['tap',[['e5',['$event']]]],['input',[['__set_model',['','other_amount','$event',[]]]]]]}}" value="{{other_amount}}" bindtap="__e" bindinput="__e"/></view></view><view class="confirm-btn data-v-791c599b"><button class="admin-button-com big blue data-v-791c599b" formType="submit" data-event-opts="{{[['tap',[['wexinPayFn',['$event']]]]]}}" bindtap="__e">充值</button></view></view><kd-entrance vue-id="1fcc04e8-1" class="data-v-791c599b" bind:__l="__l"></kd-entrance></view>
			
 
				+<view class="data-v-b11d9854"><view class="recharge_title data-v-b11d9854">充值金额</view><view class="data-v-b11d9854"><view class="amount_area data-v-b11d9854"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="{{['amount string left data-v-b11d9854',amount==5000?'selected':'']}}" bindtap="__e">¥5000</view><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="{{['amount string middle data-v-b11d9854',amount==1000?'selected':'']}}" bindtap="__e">¥1000</view><view data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" class="{{['amount string data-v-b11d9854',amount==800?'selected':'']}}" bindtap="__e">¥800</view></view><view class="amount_area data-v-b11d9854"><view data-event-opts="{{[['tap',[['e3',['$event']]]]]}}" class="{{['amount string left data-v-b11d9854',amount==500?'selected':'']}}" bindtap="__e">¥500</view><view data-event-opts="{{[['tap',[['e4',['$event']]]]]}}" class="{{['amount string middle data-v-b11d9854',amount==100?'selected':'']}}" bindtap="__e">¥100</view><view class="amount data-v-b11d9854"><input class="other_amount data-v-b11d9854" type="digit" placeholder="其它金额" data-event-opts="{{[['tap',[['e5',['$event']]]],['input',[['__set_model',['','other_amount','$event',[]]]]]]}}" value="{{other_amount}}" bindtap="__e" bindinput="__e"/></view></view><view class="confirm-btn data-v-b11d9854"><button class="admin-button-com big blue data-v-b11d9854" formType="submit" data-event-opts="{{[['tap',[['wexinPayFn',['$event']]]]]}}" bindtap="__e">充值</button></view></view></view>
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/recharge.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/recharge.wxss
@@ -1 +1 @@
 
				-.recharge_title.data-v-791c599b{font-weight:700;font-size:30rpx;margin:30rpx 0 50rpx 0;padding:0 0 0 28rpx}.amount_area.data-v-791c599b{display:block;width:100%;height:130rpx;margin:35rpx 0 0 0;padding-left:35rpx}.amount_area .amount.data-v-791c599b{border:1rpx solid #f9f6ef;width:23%;height:120rpx;float:left;font-size:25rpx;background-color:#f2f2f2;color:#666}.amount_area .amount .other_amount.data-v-791c599b{font-size:25rpx;margin-top:40rpx;text-align:center}.amount_area .string.data-v-791c599b{padding:40rpx 0 0 45rpx}.amount_area .middle.data-v-791c599b{margin:0 90rpx 0 90rpx}.amount_area .selected.data-v-791c599b{background-color:#09f;color:#fff}.confirm-btn.data-v-791c599b{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-791c599b{width:100%}
			
 
				+.recharge_title.data-v-b11d9854{font-weight:700;font-size:30rpx;margin:30rpx 0 50rpx 0;padding:0 0 0 28rpx}.amount_area.data-v-b11d9854{display:block;width:100%;height:130rpx;margin:35rpx 0 0 0;padding-left:35rpx}.amount_area .amount.data-v-b11d9854{border:1rpx solid #f9f6ef;width:23%;height:120rpx;float:left;font-size:25rpx;background-color:#f2f2f2;color:#666}.amount_area .amount .other_amount.data-v-b11d9854{font-size:25rpx;margin-top:40rpx;text-align:center}.amount_area .string.data-v-b11d9854{padding:40rpx 0 0 45rpx}.amount_area .middle.data-v-b11d9854{margin:0 90rpx 0 90rpx}.amount_area .selected.data-v-b11d9854{background-color:#09f;color:#fff}.confirm-btn.data-v-b11d9854{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-b11d9854{width:100%}
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.js
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxml
@@ -1 +1 @@
 
				-<view class="_div data-v-1305d6c7"><block wx:if="{{!$root.g0}}"><block class="data-v-1305d6c7"><t-table vue-id="3b043ee4-1" headerBackgroundColor="#F0F2F6" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><t-tr vue-id="{{('3b043ee4-2')+','+('3b043ee4-1')}}" header="{{true}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-th vue-id="{{('3b043ee4-3-'+index)+','+('3b043ee4-2')}}" align="{{item.align}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}">{{''+item.name+''}}</t-th></block></t-tr><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-tr vue-id="{{('3b043ee4-4-'+index)+','+('3b043ee4-1')}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="column" wx:for-index="colIndex" wx:key="colIndex"><t-td vue-id="{{('3b043ee4-5-'+index+'-'+colIndex)+','+('3b043ee4-4-'+index)}}" align="{{column.align}}" color="{{column.color}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><view class="data-v-1305d6c7">{{''+(item[column.dataIndex]||"")+''}}</view></t-td></block></t-tr></block></t-table></block></block><block wx:else><block class="data-v-1305d6c7"><app-wrapper-empty vue-id="3b043ee4-6" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-1305d6c7" bind:__l="__l"></app-wrapper-empty></block></block><kd-entrance vue-id="3b043ee4-7" class="data-v-1305d6c7" bind:__l="__l"></kd-entrance></view>
			
 
				+<view class="_div data-v-364121ae"><block wx:if="{{!$root.g0}}"><block class="data-v-364121ae"><t-table vue-id="3b043ee4-1" headerBackgroundColor="#F0F2F6" class="data-v-364121ae" bind:__l="__l" vue-slots="{{['default']}}"><t-tr vue-id="{{('3b043ee4-2')+','+('3b043ee4-1')}}" header="{{true}}" class="data-v-364121ae" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-th vue-id="{{('3b043ee4-3-'+index)+','+('3b043ee4-2')}}" align="{{item.align}}" class="data-v-364121ae" bind:__l="__l" vue-slots="{{['default']}}">{{''+item.name+''}}</t-th></block></t-tr><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-tr vue-id="{{('3b043ee4-4-'+index)+','+('3b043ee4-1')}}" class="data-v-364121ae" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="column" wx:for-index="colIndex" wx:key="colIndex"><t-td vue-id="{{('3b043ee4-5-'+index+'-'+colIndex)+','+('3b043ee4-4-'+index)}}" align="{{column.align}}" color="{{column.color}}" class="data-v-364121ae" bind:__l="__l" vue-slots="{{['default']}}"><view class="data-v-364121ae">{{''+(item[column.dataIndex]||"")+''}}</view></t-td></block></t-tr></block></t-table></block></block><block wx:else><block class="data-v-364121ae"><app-wrapper-empty vue-id="3b043ee4-6" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-364121ae" bind:__l="__l"></app-wrapper-empty></block></block></view>
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxss
@@ -0,0 +1 @@
 
				+/* pagesStore/me/rechargeList.wxss */
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/withdraw.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/withdraw.js
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/withdraw.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/withdraw.wxml
@@ -1 +1 @@
 
				-<view class="_div data-v-e1b146aa"><block wx:if="{{!$root.g0}}"><block class="data-v-e1b146aa"><t-table vue-id="38beb709-1" headerBackgroundColor="#F0F2F6" class="data-v-e1b146aa" bind:__l="__l" vue-slots="{{['default']}}"><t-tr vue-id="{{('38beb709-2')+','+('38beb709-1')}}" header="{{true}}" class="data-v-e1b146aa" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-th vue-id="{{('38beb709-3-'+index)+','+('38beb709-2')}}" align="{{item.align}}" class="data-v-e1b146aa" bind:__l="__l" vue-slots="{{['default']}}">{{''+item.name+''}}</t-th></block></t-tr><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-tr vue-id="{{('38beb709-4-'+index)+','+('38beb709-1')}}" class="data-v-e1b146aa" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="column" wx:for-index="colIndex" wx:key="colIndex"><t-td vue-id="{{('38beb709-5-'+index+'-'+colIndex)+','+('38beb709-4-'+index)}}" align="{{column.align}}" color="{{column.color}}" class="data-v-e1b146aa" bind:__l="__l" vue-slots="{{['default']}}"><view class="data-v-e1b146aa">{{''+(item[column.dataIndex]||"")+''}}</view></t-td></block></t-tr></block></t-table></block></block><block wx:else><block class="data-v-e1b146aa"><app-wrapper-empty vue-id="38beb709-6" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-e1b146aa" bind:__l="__l"></app-wrapper-empty></block></block><kd-entrance vue-id="38beb709-7" class="data-v-e1b146aa" bind:__l="__l"></kd-entrance></view>
			
 
				+<view class="_div data-v-67f85dba"><block wx:if="{{!$root.g0}}"><block class="data-v-67f85dba"><t-table vue-id="38beb709-1" headerBackgroundColor="#F0F2F6" class="data-v-67f85dba" bind:__l="__l" vue-slots="{{['default']}}"><t-tr vue-id="{{('38beb709-2')+','+('38beb709-1')}}" header="{{true}}" class="data-v-67f85dba" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-th vue-id="{{('38beb709-3-'+index)+','+('38beb709-2')}}" align="{{item.align}}" class="data-v-67f85dba" bind:__l="__l" vue-slots="{{['default']}}">{{''+item.name+''}}</t-th></block></t-tr><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-tr vue-id="{{('38beb709-4-'+index)+','+('38beb709-1')}}" class="data-v-67f85dba" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="column" wx:for-index="colIndex" wx:key="colIndex"><t-td vue-id="{{('38beb709-5-'+index+'-'+colIndex)+','+('38beb709-4-'+index)}}" align="{{column.align}}" color="{{column.color}}" class="data-v-67f85dba" bind:__l="__l" vue-slots="{{['default']}}"><view class="data-v-67f85dba">{{''+(item[column.dataIndex]||"")+''}}</view></t-td></block></t-tr></block></t-table></block></block><block wx:else><block class="data-v-67f85dba"><app-wrapper-empty vue-id="38beb709-6" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-67f85dba" bind:__l="__l"></app-wrapper-empty></block></block></view>
			
--- a/ghsApp/dist/build/mp-weixin/pagesStore/me/withdraw.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesStore/me/withdraw.wxss
@@ -0,0 +1 @@
 
				+/* pagesStore/me/withdraw.wxss */
			
--- a/ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/exDetails.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/exDetails.js
--- a/ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/exDetails.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/exDetails.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/exDetails.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/exDetails.wxss
--- a/ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.js
@@ -1,4 +1,4 @@
 
				-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesStorehouse/components/CommodityStock"],{"0cba":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("7602"),u=function(){Promise.all([e.e("common/vendor"),e.e("components/app-img")]).then(function(){return resolve(e("cb3c"))}.bind(null,e)).catch(e.oe)},c={name:"Commodity",components:{AppImg:u},props:{type:{type:String,default:o.STOCK_TYPE.WARN},isPrice:{type:Boolean,default:!0},isEdit:{type:Boolean,default:!0},info:{required:!0}},data:function(){return{STOCK_TYPE:o.STOCK_TYPE}},methods:{customNum:function(){this.$emit("customNum")},addEvent:function(){this.$emit("add")},subtractEvent:function(){this.$emit("subtract")},delEvent:function(){this.$emit("del")}}};n.default=c},"108f":function(t,n,e){"use strict";e.r(n);var o=e("0cba"),u=e.n(o);for(var c in o)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(c);n["default"]=u.a},"394f":function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"7acd":function(t,n,e){"use strict";e.r(n);var o=e("394f"),u=e("108f");for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);e("f9fa");var i,a=e("0095"),r=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,"9ad5cb5c",null,!1,o["a"],i);n["default"]=r.exports},c3a6:function(t,n,e){},f9fa:function(t,n,e){"use strict";var o=e("c3a6"),u=e.n(o);u.a}}]);
			
 
				+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesStorehouse/components/CommodityStock"],{"0c4f":function(t,n,e){"use strict";var o=e("9383"),u=e.n(o);u.a},"0cba":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("7602"),u=function(){Promise.all([e.e("common/vendor"),e.e("components/app-img")]).then(function(){return resolve(e("cb3c"))}.bind(null,e)).catch(e.oe)},c={name:"Commodity",components:{AppImg:u},props:{type:{type:String,default:o.STOCK_TYPE.WARN},isPrice:{type:Boolean,default:!0},isEdit:{type:Boolean,default:!0},info:{required:!0}},data:function(){return{STOCK_TYPE:o.STOCK_TYPE}},methods:{customNum:function(){this.$emit("customNum")},addEvent:function(){this.$emit("add")},subtractEvent:function(){this.$emit("subtract")},delEvent:function(){this.$emit("del")}}};n.default=c},"108f":function(t,n,e){"use strict";e.r(n);var o=e("0cba"),u=e.n(o);for(var c in o)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(c);n["default"]=u.a},"7acd":function(t,n,e){"use strict";e.r(n);var o=e("d407"),u=e("108f");for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);e("0c4f");var i,r=e("0095"),a=Object(r["a"])(u["default"],o["b"],o["c"],!1,null,"60f33d91",null,!1,o["a"],i);n["default"]=a.exports},9383:function(t,n,e){},d407:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement;t._self._c},c=[]}}]);
			
 
				 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
			
 
				     'pagesStorehouse/components/CommodityStock-create-component',
			
 
				     {
			
--- a/ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.wxml
@@ -1 +1 @@
 
				-<view class="item-cmd_bx data-v-9ad5cb5c"><view class="img_bx data-v-9ad5cb5c"><app-img vue-id="5cb945ce-1" src="{{info.cover}}" alt="商品图" mode="aspectFit" height="{{160}}" class="data-v-9ad5cb5c" bind:__l="__l"></app-img></view><navigator class="{{['cmd-info_bx data-v-9ad5cb5c',type==STOCK_TYPE.WARN?'':'active']}}" url="{{type==STOCK_TYPE.WARN?'':'/pagesStorehouse/stockWarn/detailed?id='+info.itemId}}"><view class="tit data-v-9ad5cb5c">{{info.itemName||""}}</view><view class="kc data-v-9ad5cb5c">{{(info.rank||"")+"级"}}</view><view class="num-open_bx data-v-9ad5cb5c"><block wx:if="{{isPrice}}"><view class="price data-v-9ad5cb5c">{{"￥"+info.price}}</view></block><block wx:if="{{isEdit}}"><block wx:if="{{type==STOCK_TYPE.WARN}}"><view class="open-bx warn data-v-9ad5cb5c">库存<text style="color:#FF2842;margin-left:10rpx;" class="data-v-9ad5cb5c">{{''+info.stock}}</text></view></block><block wx:else><block wx:if="{{type==STOCK_TYPE.MANAGE}}"><view class="open-bx data-v-9ad5cb5c">库存<text style="margin-left:10rpx;" class="data-v-9ad5cb5c">{{info.stock}}</text></view></block></block></block></view></navigator></view>
			
 
				+<view class="item-cmd_bx data-v-60f33d91"><view class="img_bx data-v-60f33d91"><app-img vue-id="5cb945ce-1" src="{{info.cover}}" alt="商品图" mode="aspectFit" height="{{160}}" class="data-v-60f33d91" bind:__l="__l"></app-img></view><navigator class="{{['cmd-info_bx data-v-60f33d91',type==STOCK_TYPE.WARN?'':'active']}}" url="{{type==STOCK_TYPE.WARN?'':'/pagesStorehouse/stockWarn/detailed?id='+info.itemId}}"><view class="tit data-v-60f33d91">{{info.itemName||""}}</view><view class="kc data-v-60f33d91">{{(info.rank||"")+"级"}}</view><view class="num-open_bx data-v-60f33d91"><block wx:if="{{isPrice}}"><view class="price data-v-60f33d91">{{"￥"+info.price}}</view></block><block wx:if="{{isEdit}}"><block wx:if="{{type==STOCK_TYPE.WARN}}"><view class="open-bx warn data-v-60f33d91">库存<text style="color:#FF2842;margin-left:10rpx;font-size:32rpx;" class="data-v-60f33d91">{{''+info.stock}}</text></view></block><block wx:else><block wx:if="{{type==STOCK_TYPE.MANAGE}}"><view class="open-bx data-v-60f33d91">库存<text style="margin-left:10rpx;font-size:32rpx;" class="data-v-60f33d91">{{info.stock}}</text></view></block></block></block></view></navigator></view>
			
--- a/ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.wxss
@@ -1 +1 @@
 
				-.item-cmd_bx.data-v-9ad5cb5c{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-9ad5cb5c{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-9ad5cb5c{position:relative;padding-left:177rpx}.item-cmd_bx .cmd-info_bx.active.data-v-9ad5cb5c:before{content:" ";height:22rpx;width:22rpx;border-width:2rpx 2rpx 0 0;border-color:#b2b2b2;border-style:solid;-webkit-transform:matrix(.5,.5,-.5,.5,0,0);transform:matrix(.5,.5,-.5,.5,0,0);position:absolute;top:50%;margin-top:-12rpx;right:30rpx}.item-cmd_bx .cmd-info_bx .tit.data-v-9ad5cb5c{font-size:28rpx;font-weight:400;color:#333;padding-top:10rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-9ad5cb5c{color:#999;font-size:24rpx;padding:10rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-9ad5cb5c{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .price.data-v-9ad5cb5c{font-size:28rpx;color:#999;-webkit-box-flex:1;-webkit-flex:1;flex:1}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-9ad5cb5c{color:#333}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx text.data-v-9ad5cb5c{font-size:24rpx;font-weight:700}
			
 
				+.item-cmd_bx.data-v-60f33d91{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-60f33d91{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-60f33d91{position:relative;padding-left:177rpx}.item-cmd_bx .cmd-info_bx.active.data-v-60f33d91:before{content:" ";height:22rpx;width:22rpx;border-width:2rpx 2rpx 0 0;border-color:#b2b2b2;border-style:solid;-webkit-transform:matrix(.5,.5,-.5,.5,0,0);transform:matrix(.5,.5,-.5,.5,0,0);position:absolute;top:50%;margin-top:-12rpx;right:30rpx}.item-cmd_bx .cmd-info_bx .tit.data-v-60f33d91{font-size:28rpx;font-weight:400;color:#333;padding-top:10rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-60f33d91{color:#999;font-size:24rpx;padding:10rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-60f33d91{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .price.data-v-60f33d91{font-size:28rpx;color:#999;-webkit-box-flex:1;-webkit-flex:1;flex:1}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-60f33d91{color:#333}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx text.data-v-60f33d91{font-size:24rpx;font-weight:700}
			
--- a/ghsApp/dist/build/mp-weixin/pagesStorehouse/flower/category.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStorehouse/flower/category.js
		`@@ -0,0 +1 @@`
		`+.uni-input.data-v-27a4c0d6{width:420rpx;height:50rpx;padding-top:5rpx}`