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

ghs/src/views/order/add.vue

@@ -177,7 +177,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="结账" v-if="isAccounts" :visible.sync="isAccounts" width="30%" center>
+    <el-dialog title="结账" v-if="isAccounts" :visible.sync="isAccounts" width="573px" center>
       <div class="">
         <div class="accounts-list">
           客户

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

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

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

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

ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json

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

ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

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

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

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

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

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

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

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

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/module/app-tag.json

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

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

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

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

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

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

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

ghsApp/dist/build/mp-weixin/components/plugin/modal.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/simple-address.json

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

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

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

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

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

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

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

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

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

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

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

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

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

ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/linkage-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json

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

ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json

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

ghsApp/src/admin/staff/achieve.vue

@@ -4,6 +4,7 @@
 				<DorpdownSelect class="bar"
 					:menuObj="menuTimeObj"
 					:selectItemId.sync="selectTimeId"
+																				:typeTime="true"
 					:typeSelect="1" top="0px"
 					@selectSussess="selectSussess" />
 
@@ -152,9 +153,7 @@ export default {
 		this.menuTimeObj = {title:'时间',titleChild:'时间',list: dateDefaultOption};
 
 		this.shopId = this.getLoginInfo.shopId;
-		console.log(' this.selectShopId',this.shopId)
-		console.log(' this.getLoginInfo.shopId',this.getLoginInfo.shopId)
-		this.init();
+
 	},
 	methods: {
 		...mapActions(['setUserShopAll']),
@@ -278,4 +277,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

ghsApp/src/components/app-address-group.vue

@@ -24,7 +24,8 @@
 		</tui-list-cell>
 		<tui-list-cell v-if="isFloor" class="line-cell" :hover="false">
 			<view class="tui-title ">门牌号</view>
-			<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" @input="changeFloor" placeholder="楼号门牌号（选填）"/>
+<!--			<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" @input="changeFloor" placeholder="楼号门牌号（选填）"/>-->
+			<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号（选填）"/>
 		</tui-list-cell>
 		<!-- 选择地区 -->
 		<app-area-sel :show.sync="showRegion" @change="changeAreaFn" :city="form.city"/>
@@ -103,8 +104,8 @@ export default {
           this.form.address = res.data.address;
           this.form.latitude = res.data.lat;
           this.form.longitude = res.data.long;
-          this.form.customMobile = res.data.name;
-          this.form.customName = res.data.mobile;
+          this.form.customMobile = res.data.mobile;
+          this.form.customName = res.data.name;
           this.$emit("selectAdress", this.form);
         })
       } else {
@@ -142,9 +143,9 @@ export default {
 			this.form.longitude = e.location.lng;
 			this.$emit("selectAdress", this.form);
 		},
-		// changeFloor(e) {
-		// 	this.$emit("selectAdress", this.form);
-		// }
+		changeFloor(e) {
+			this.$emit("selectAdress", this.form);
+		}
 	},
 	watch: {
 		getFormObj() {

ghsApp/src/mixins/product.js

@@ -102,9 +102,22 @@ export default {
 			return "";
 		},
 		//选择商品总价
-		allPrice() {
+		allPriceFun(){
 			let price = 0;
+			if (this.selectList) {
+				for (const item of this.selectList) {
+					const itemInfo = this.getSelectItemById(item.id, item.classId);
+					if (itemInfo &&!this.$util.isEmpty(itemInfo.itemPrice)) {
+						price += Number(itemInfo.itemPrice);
+					}
+				}
+			}
 
+			return Math.round(price * 100) / 100;
+		},
+		allPrice() {
+			let price = 0;
+			console.log('this.selectList',this.selectList)
 			if (this.selectList) {
 				for (const item of this.selectList) {
 					const itemInfo = this.getSelectItemById(item.id, item.classId);

ghsApp/src/pagesPurchase/add.vue

@@ -111,7 +111,7 @@
 							<allSelectInput :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="customData.itemPrice" :placeholder="'请填写采购总价'"
 																							:width="400" :height="60"
 																							@deleteInputVal="deleteAloneInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAloneAllInput">
-							</allSelectInput>元
+							</allSelectInput> <text style="margin-left: 20rpx">元</text>
 						</view>
 					</view>
 					<view class="select-cmd_bx">
@@ -142,7 +142,7 @@
 			padding="30rpx 30rpx"
 		>
 		</modal-module> -->
-		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent"></FooterCart>
+		<FooterCart :price="allPriceFun" :count="allCount" @confirm="confirmSelectEvent"></FooterCart>
     <kd-entrance></kd-entrance>
 	</view>
 </template>

ghsApp/src/pagesPurchase/details.vue

@@ -31,11 +31,9 @@
 									<view class="info-line">
 										<text class="item-type">b级</text>
 										<text class="item-count">
-											<text v-if="item.bigCount > 0 || item.smallCount > 0">{{
-												`${item.bigCount}`
-											}}</text>
-											<text v-if="item.smallCount > 0">/</text>
-											<text v-if="item.smallCount > 0">{{ `${item.smallCount}` }}</text>
+											<text >{{`${item.bigCount}`}}</text>
+											<text >/</text>
+											<text >{{ `${item.smallCount}` }}</text>
 										</text>
 									</view>
 								</view>

ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -96,13 +96,13 @@ import AppDatePicker from "@/components/app-date-picker";
 import DorpdownSelect from "@/components/module/dorpdownSelect";
 import { selectShop } from "@/mixins";
 import { createStockOutOrderApi } from "@/api/storehouse/stock";
-import {mapActions} from "vuex";
+import {mapActions, mapGetters} from "vuex";
 const formUtil = require("@/utils/formValidation.js");
 
 export default {
 	components: { TuiListCell, AppDatePicker, DorpdownSelect },
 	mixins: [productMins, selectShop],
-
+	computed: {		...mapGetters(["getLoginInfo"])	},
 	data() {
 		return {
 			pageType: "allotEx",
@@ -137,6 +137,9 @@ export default {
 	onShow() {
 		console.log('拿到选择商品列表', this.selectList);
 	},
+	onLoad(){
+		this.form.inShopId = this.getLoginInfo.shopId;
+	},
 	methods: {
 		...mapActions(["resetSelectInfoByType"]),
 		/**
@@ -146,7 +149,8 @@ export default {
 			this.resetSelectInfoByType(this.pageType)
 		},
 		async init() {
-			this.form.inShopId = this.userInfo.id;
+			// this.form.inShopId = this.userInfo.id;
+
 		},
 		gotoSelectPage() {
 			uni.navigateTo({

hdApp/dist/build/mp-weixin/admin/ad/add.wxss

@@ -1 +1 @@
-.app-content.data-v-18b0b8a3{min-height:calc(100vh - 20rpx);padding-top:20rpx}.module-com.data-v-18b0b8a3{margin-bottom:20rpx}.module-com .line-img-wrap.data-v-18b0b8a3{display:block}.module-com .line-img-wrap .line-img.data-v-18b0b8a3{margin-top:30rpx}.module-com .goods-blo.data-v-18b0b8a3{display:block}.module-com .goods-blo .goods-list-wrap .goods-list.data-v-18b0b8a3{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;margin-bottom:20rpx}.module-com .goods-blo .goods-list-wrap .goods-list .list-img.data-v-18b0b8a3{width:120rpx;height:120rpx;margin-right:20rpx}.module-com .goods-blo .goods-list-wrap .goods-list .list-img ._img.data-v-18b0b8a3{height:100%}.module-com .goods-blo .goods-list-wrap .goods-list .list-right .app-price.data-v-18b0b8a3{margin-top:10rpx}.module-com .goods-blo .admin-button-com.data-v-18b0b8a3{width:125rpx}.module-com .ad-name.data-v-18b0b8a3{color:#666;margin-right:20rpx}.confirm-btn.data-v-18b0b8a3{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-18b0b8a3{width:100%}.checkbox-text.data-v-18b0b8a3{font-size:20rpx}.app-img-upload.data-v-18b0b8a3{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column}
+.app-content.data-v-17499730{min-height:calc(100vh - 20rpx);padding-top:20rpx}.module-com.data-v-17499730{margin-bottom:20rpx}.module-com .line-img-wrap.data-v-17499730{display:block}.module-com .line-img-wrap .line-img.data-v-17499730{margin-top:30rpx}.module-com .goods-blo.data-v-17499730{display:block}.module-com .goods-blo .goods-list-wrap .goods-list.data-v-17499730{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;margin-bottom:20rpx}.module-com .goods-blo .goods-list-wrap .goods-list .list-img.data-v-17499730{width:120rpx;height:120rpx;margin-right:20rpx}.module-com .goods-blo .goods-list-wrap .goods-list .list-img ._img.data-v-17499730{height:100%}.module-com .goods-blo .goods-list-wrap .goods-list .list-right .app-price.data-v-17499730{margin-top:10rpx}.module-com .goods-blo .admin-button-com.data-v-17499730{width:125rpx}.module-com .ad-name.data-v-17499730{color:#666;margin-right:20rpx}.confirm-btn.data-v-17499730{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-17499730{width:100%}.checkbox-text.data-v-17499730{font-size:20rpx}.app-img-upload.data-v-17499730{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column}

hdApp/dist/build/mp-weixin/admin/billing/confirm.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/billing/confirm"],{"01d4":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var r=function(){var n=this,t=n.$createElement;n._self._c},c=[]},1376:function(n,t,e){"use strict";(function(n){e("6cdc");u(e("4a15"));var t=u(e("84dc"));function u(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,e("f3be")["createPage"])},"52e1":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={name:"BillingConfirm",components:{},data:function(){return{showRegion:!1}},methods:{}};t.default=u},"5b79":function(n,t,e){"use strict";e.r(t);var u=e("52e1"),r=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=r.a},6168:function(n,t,e){"use strict";var u=e("e0ff"),r=e.n(u);r.a},"84dc":function(n,t,e){"use strict";e.r(t);var u=e("01d4"),r=e("5b79");for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);e("6168");var i,o=e("0095"),f=Object(o["a"])(r["default"],u["b"],u["c"],!1,null,"7eb96bc4",null,!1,u["a"],i);t["default"]=f.exports},e0ff:function(n,t,e){}},[["1376","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/billing/confirm"],{"01d4":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return c})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}));var c=function(){var n=this,t=n.$createElement;n._self._c},r=[]},1376:function(n,t,e){"use strict";(function(n){e("6cdc");u(e("e3ac"));var t=u(e("84dc"));function u(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,e("1480")["createPage"])},"42b6":function(n,t,e){},"5b79":function(n,t,e){"use strict";e.r(t);var u=e("b806"),c=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=c.a},6168:function(n,t,e){"use strict";var u=e("42b6"),c=e.n(u);c.a},"84dc":function(n,t,e){"use strict";e.r(t);var u=e("01d4"),c=e("5b79");for(var r in c)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(r);e("6168");var i,o=e("41a2"),a=Object(o["a"])(c["default"],u["b"],u["c"],!1,null,"7eb96bc4",null,!1,u["a"],i);t["default"]=a.exports},b806:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={name:"BillingConfirm",components:{},data:function(){return{showRegion:!1}},methods:{}};t.default=u}},[["1376","common/runtime","common/vendor"]]]);

hdApp/dist/build/mp-weixin/admin/billing/priceChange.wxml

@@ -1 +1 @@
-<view class="billing_box_bg data-v-3ef81ed5"><view class="input-wrap data-v-3ef81ed5"><app-search-module vue-id="2b6abfff-1" placeholder="请输入关键词，支持拼音首字母搜索" value="{{py}}" data-event-opts="{{[['^search',[['searchFn']]],['^input',[['__set_model',['','py','$event',[]]]]]]}}" bind:search="__e" bind:input="__e" class="data-v-3ef81ed5" bind:__l="__l"></app-search-module></view><view class="scroll-middle_bx data-v-3ef81ed5"><block wx:if="{{!$root.g0}}"><block class="data-v-3ef81ed5"><view style="width:100%;padding:30rpx;" class="data-v-3ef81ed5"><block wx:for="{{filterProductInfoContrapose}}" wx:for-item="productItem" wx:for-index="productIndex" wx:key="productIndex"><commondity vue-id="{{'2b6abfff-2-'+productIndex}}" type="{{COMMODITY_TYPE.CHANGE}}" info="{{productItem}}" autoPrice="{{productItem.priceLabel=='2'?productItem.price:null}}" class="data-v-3ef81ed5" bind:__l="__l"></commondity></block></view></block></block><block wx:else><block class="data-v-3ef81ed5"><app-wrapper-empty vue-id="2b6abfff-3" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-3ef81ed5" bind:__l="__l"></app-wrapper-empty></block></block></view></view>
+<view class="billing_box_bg data-v-d64f4d40"><view class="input-wrap data-v-d64f4d40"><app-search-module vue-id="2b6abfff-1" placeholder="请输入关键词，支持拼音首字母搜索" value="{{py}}" data-event-opts="{{[['^search',[['searchFn']]],['^input',[['__set_model',['','py','$event',[]]]]]]}}" bind:search="__e" bind:input="__e" class="data-v-d64f4d40" bind:__l="__l"></app-search-module></view><view class="scroll-middle_bx data-v-d64f4d40"><block wx:if="{{!$root.g0}}"><block class="data-v-d64f4d40"><view style="width:100%;padding:30rpx;" class="data-v-d64f4d40"><block wx:for="{{filterProductInfoContrapose}}" wx:for-item="productItem" wx:for-index="productIndex" wx:key="productIndex"><commondity vue-id="{{'2b6abfff-2-'+productIndex}}" type="{{COMMODITY_TYPE.CHANGE}}" info="{{productItem}}" autoPrice="{{productItem.priceLabel=='2'?productItem.price:null}}" class="data-v-d64f4d40" bind:__l="__l"></commondity></block></view></block></block><block wx:else><block class="data-v-d64f4d40"><app-wrapper-empty vue-id="2b6abfff-3" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-d64f4d40" bind:__l="__l"></app-wrapper-empty></block></block></view></view>

hdApp/dist/build/mp-weixin/admin/billing/result.wxss

@@ -1 +1 @@
-.admin-button-com.data-v-7f24169e{margin-bottom:20rpx;width:100%}.zuhe-box.data-v-7f24169e{width:100%;background-color:#fff}.zuhe-box .zuhe-remark.data-v-7f24169e{color:#333;font-size:32rpx;font-weight:700;line-height:88rpx;padding-left:30rpx;border-bottom:1rpx solid #eee}.zuhe-box .zuhe-center.data-v-7f24169e{margin-top:20rpx;font-size:28rpx;margin:0 30rpx;height:90rpx;box-sizing:border-box}.zuhe-box .zuhe-center .zuhe-title.data-v-7f24169e{color:#666}.zuhe-box .zuhe-center .zuhe-val.data-v-7f24169e{position:relative;width:70%;height:60rpx;padding:10rpx;color:#333;border:1rpx solid #868686;border:none}.zuhe-box .zuhe-center .zuhe-val.active.data-v-7f24169e:before{content:" ";height:22rpx;width:22rpx;border-width:2rpx 2rpx 0 0;border-color:#868686;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}.zuhe-box .border.data-v-7f24169e{border-bottom:1rpx solid #eee}
+.admin-button-com.data-v-50775080{margin-bottom:20rpx;width:100%}.zuhe-box.data-v-50775080{width:100%;background-color:#fff}.zuhe-box .zuhe-remark.data-v-50775080{color:#333;font-size:32rpx;font-weight:700;line-height:88rpx;padding-left:30rpx;border-bottom:1rpx solid #eee}.zuhe-box .zuhe-center.data-v-50775080{margin-top:20rpx;font-size:28rpx;margin:0 30rpx;height:90rpx;box-sizing:border-box}.zuhe-box .zuhe-center .zuhe-title.data-v-50775080{color:#666}.zuhe-box .zuhe-center .zuhe-val.data-v-50775080{position:relative;width:70%;height:60rpx;padding:10rpx;color:#333;border:1rpx solid #868686;border:none}.zuhe-box .zuhe-center .zuhe-val.active.data-v-50775080:before{content:" ";height:22rpx;width:22rpx;border-width:2rpx 2rpx 0 0;border-color:#868686;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}.zuhe-box .border.data-v-50775080{border-bottom:1rpx solid #eee}

hdApp/dist/build/mp-weixin/admin/ghs/shop.wxml

@@ -1 +1 @@
-<view class="app-content _div data-v-7b323c96"><view class="list-box data-v-7b323c96"><block wx:if="{{!$root.g0}}"><view class="data-v-7b323c96"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="flex list data-v-7b323c96"><image src="{{item.avatar}}" class="data-v-7b323c96"></image><view class="list-msg data-v-7b323c96"><view class="data-v-7b323c96">{{item.name}}</view><text class="data-v-7b323c96">{{"累积消费 "+item.expendAmount}}</text></view></view></block></view></block><block wx:else><block class="data-v-7b323c96"><app-wrapper-empty vue-id="538898b6-1" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-7b323c96" bind:__l="__l"></app-wrapper-empty></block></block></view><kd-entrance vue-id="538898b6-2" class="data-v-7b323c96" bind:__l="__l"></kd-entrance></view>
+<view class="app-content _div data-v-780bb350"><view class="list-box data-v-780bb350"><block wx:if="{{!$root.g0}}"><view class="data-v-780bb350"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="flex list data-v-780bb350"><image src="{{item.avatar}}" class="data-v-780bb350"></image><view class="list-msg data-v-780bb350"><view class="data-v-780bb350">{{item.name}}</view><text class="data-v-780bb350">{{"累积消费 "+item.expendAmount}}</text></view></view></block></view></block><block wx:else><block class="data-v-780bb350"><app-wrapper-empty vue-id="538898b6-1" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-780bb350" bind:__l="__l"></app-wrapper-empty></block></block></view><kd-entrance vue-id="538898b6-2" class="data-v-780bb350" bind:__l="__l"></kd-entrance></view>

hdApp/dist/build/mp-weixin/admin/ghs/shop.wxss

@@ -1 +1 @@
-.app-content .flex.data-v-7b323c96{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-7b323c96{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-7b323c96{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-7b323c96{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-7b323c96{padding:20rpx}.app-content .list-box .list.data-v-7b323c96{background:#fff;padding:20rpx;margin-bottom:20rpx;border-radius:20rpx}.app-content .list-box .list image.data-v-7b323c96{width:100rpx;height:100rpx;margin-right:20rpx;border-radius:50%}.app-content .list-box .list .list-msg.data-v-7b323c96{line-height:1;font-size:32rpx;font-weight:700}.app-content .list-box .list .list-msg view.data-v-7b323c96{margin-bottom:20rpx}.app-content .list-box .list .list-msg text.data-v-7b323c96{font-size:24rpx;font-weight:500;color:#949494}
+.app-content .flex.data-v-780bb350{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-780bb350{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-780bb350{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-780bb350{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-780bb350{padding:20rpx}.app-content .list-box .list.data-v-780bb350{background:#fff;padding:20rpx;margin-bottom:20rpx;border-radius:20rpx}.app-content .list-box .list image.data-v-780bb350{width:100rpx;height:100rpx;margin-right:20rpx;border-radius:50%}.app-content .list-box .list .list-msg.data-v-780bb350{line-height:1;font-size:32rpx;font-weight:700}.app-content .list-box .list .list-msg view.data-v-780bb350{margin-bottom:20rpx}.app-content .list-box .list .list-msg text.data-v-780bb350{font-size:24rpx;font-weight:500;color:#949494}

hdApp/dist/build/mp-weixin/admin/goodsManage/goods-name.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/goodsManage/goods-name"],{"2d5f":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("4cdc"),i=function(){e.e("components/plugin/list-cell").then(function(){return resolve(e("1861"))}.bind(null,e)).catch(e.oe)},a={name:"goods-name-setting",components:{TuiListCell:i},data:function(){return{data:{},form:{picIdList:[],price:0,name:"",categoryIdList:[]}}},onLoad:function(){},methods:{init:function(){this._getDet()},_getDet:function(){var t=this;(0,o.getDetB)({id:this.option.id}).then((function(n){t.$util.isEmpty(n.data)||(t.data=n.data,Object.keys(t.form).forEach((function(e,o){t.form[e]=n.data[e]})),t.form.picIdList=[n.data.id],console.log(t.form))}))},confirmFn:function(){var t=this;(0,o.picRemark)(this.form).then((function(n){t.$msg("修改成功！")}))}}};n.default=a},"45a5":function(t,n,e){"use strict";e.r(n);var o=e("2d5f"),i=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=i.a},"86d3":function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var i=function(){var t=this,n=t.$createElement;t._self._c},a=[]},"968c":function(t,n,e){"use strict";e.r(n);var o=e("86d3"),i=e("45a5");for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);e("f26e");var c,u=e("0095"),r=Object(u["a"])(i["default"],o["b"],o["c"],!1,null,"2ae12454",null,!1,o["a"],c);n["default"]=r.exports},a097:function(t,n,e){"use strict";(function(t){e("6cdc");o(e("4a15"));var n=o(e("968c"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("f3be")["createPage"])},c364:function(t,n,e){},f26e:function(t,n,e){"use strict";var o=e("c364"),i=e.n(o);i.a}},[["a097","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/goodsManage/goods-name"],{"45a5":function(t,n,e){"use strict";e.r(n);var o=e("fdad"),a=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=a.a},"86d3":function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}));var a=function(){var t=this,n=t.$createElement;t._self._c},i=[]},"8f66":function(t,n,e){},"968c":function(t,n,e){"use strict";e.r(n);var o=e("86d3"),a=e("45a5");for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);e("f26e");var c,u=e("41a2"),r=Object(u["a"])(a["default"],o["b"],o["c"],!1,null,"2ae12454",null,!1,o["a"],c);n["default"]=r.exports},a097:function(t,n,e){"use strict";(function(t){e("6cdc");o(e("e3ac"));var n=o(e("968c"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("1480")["createPage"])},f26e:function(t,n,e){"use strict";var o=e("8f66"),a=e.n(o);a.a},fdad:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("4cdc"),a=function(){e.e("components/plugin/list-cell").then(function(){return resolve(e("1861"))}.bind(null,e)).catch(e.oe)},i={name:"goods-name-setting",components:{TuiListCell:a},data:function(){return{data:{},form:{picIdList:[],price:0,name:"",categoryIdList:[]}}},onLoad:function(){},methods:{init:function(){this._getDet()},_getDet:function(){var t=this;(0,o.getDetB)({id:this.option.id}).then((function(n){t.$util.isEmpty(n.data)||(t.data=n.data,Object.keys(t.form).forEach((function(e,o){t.form[e]=n.data[e]})),t.form.picIdList=[n.data.id],console.log(t.form))}))},confirmFn:function(){var t=this;(0,o.picRemark)(this.form).then((function(n){t.$msg("修改成功！")}))}}};n.default=i}},[["a097","common/runtime","common/vendor"]]]);