地址优化

ghs/src/views/member/list.vue

@@ -71,15 +71,6 @@
 				<span v-else></span>
 			</template>
 
-
-			<!-- 充值 -->
-			<template #slot-recharge="{scope}">
-				<el-button type="text" size="mini" @click="rechargeShowFn(scope.row)">充值</el-button>
-			</template>
-			<!-- 升级 -->
-			<template #slot-upgrade="{scope}">
-				<el-button type="text" size="mini" @click="upgradeShowFn(scope.row)">升级</el-button>
-			</template>
 		</x-crud>
 
 		<!-- 详情 -->
@@ -175,16 +166,10 @@ export default {
 						},
 						{
 							prop: 'buyNum',
-							label: '累计次数',
+							label: '消费次数',
 							align: 'center',
 							width: 120
 						},
-						{
-							prop: 'recharge',
-							label: '累计充值',
-							align: 'center',
-							width: 150
-						},
 						{
 							prop: 'growth',
 							label: '成长值',

ghsApp/src/pagesStorehouse/inventory/list.vue

@@ -53,7 +53,6 @@
 		<div class="app-footer open_btn">
 			<div @click="addEvent" class="admin-button-com middle blue">新增盘点</div>
 		</div>
-    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

hdApp/dist/build/mp-weixin/admin/home/apply.wxml

@@ -1 +1 @@
-<view class="app-content data-v-018ec8ba"><view class="apply-content_box data-v-018ec8ba"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-018ec8ba"><view class="tit data-v-018ec8ba">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-018ec8ba"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-018ec8ba"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-018ec8ba"><view class="tabs-img _div data-v-018ec8ba"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-018ec8ba"></image></view><view class="tabs-name _div data-v-018ec8ba">{{s.name}}</view></view></view></block></view></view></block></view><kd-entrance vue-id="23de2e0c-1" class="data-v-018ec8ba" bind:__l="__l"></kd-entrance></view>
+<view class="app-content data-v-2a1fae66"><view class="apply-content_box data-v-2a1fae66"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-2a1fae66"><view class="tit data-v-2a1fae66">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-2a1fae66"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-2a1fae66"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-2a1fae66"><view class="tabs-img _div data-v-2a1fae66"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-2a1fae66"></image></view><view class="tabs-name _div data-v-2a1fae66">{{s.name}}</view></view></view></block></view></view></block></view><kd-entrance vue-id="23de2e0c-1" class="data-v-2a1fae66" bind:__l="__l"></kd-entrance></view>

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

@@ -1 +1 @@
-.apply-content_box.data-v-018ec8ba{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-018ec8ba{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-018ec8ba{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-018ec8ba{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-018ec8ba{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-018ec8ba{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-018ec8ba{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-018ec8ba{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-018ec8ba:nth-child(-n + 4){margin-top:0}
+.apply-content_box.data-v-2a1fae66{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-2a1fae66{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-2a1fae66{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-2a1fae66{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-2a1fae66{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-2a1fae66{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-2a1fae66{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-2a1fae66{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-2a1fae66:nth-child(-n + 4){margin-top:0}

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/order/components/sel-mention"],{"05f8":function(n,e,t){"use strict";var u=t("ea96"),o=t.n(u);o.a},"8ca5":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u=function(){t.e("admin/home/components/plugin/time-axis").then(function(){return resolve(t("9193"))}.bind(null,t)).catch(t.oe)},o=function(){t.e("admin/home/components/plugin/timeaxis-item").then(function(){return resolve(t("9758"))}.bind(null,t)).catch(t.oe)},c={name:"sel-mention-module",components:{TimeAxis:u,TimeaxisItem:o},props:{query:{type:Object,default:function(){}},orderData:{type:Object,default:function(){}},orderComData:{type:Array,default:function(){return[]}}}};e.default=c},e136b:function(n,e,t){"use strict";var u;t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return u}));var o=function(){var n=this,e=n.$createElement;n._self._c},c=[]},e82d:function(n,e,t){"use strict";t.r(e);var u=t("e136b"),o=t("ecc6");for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);t("05f8");var i,r=t("0095"),a=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"0a3211fc",null,!1,u["a"],i);e["default"]=a.exports},ea96:function(n,e,t){},ecc6:function(n,e,t){"use strict";t.r(e);var u=t("8ca5"),o=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);e["default"]=o.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/order/components/sel-mention"],{"05f8":function(n,e,t){"use strict";var u=t("ea96"),o=t.n(u);o.a},"8ca5":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u=function(){t.e("admin/home/components/plugin/time-axis").then(function(){return resolve(t("9193"))}.bind(null,t)).catch(t.oe)},o=function(){t.e("admin/home/components/plugin/timeaxis-item").then(function(){return resolve(t("9758"))}.bind(null,t)).catch(t.oe)},c={name:"sel-mention-module",components:{TimeAxis:u,TimeaxisItem:o},props:{query:{type:Object,default:function(){}},orderData:{type:Object,default:function(){}},orderComData:{type:Array,default:function(){return[]}}}};e.default=c},e136:function(n,e,t){"use strict";var u;t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return u}));var o=function(){var n=this,e=n.$createElement;n._self._c},c=[]},e82d:function(n,e,t){"use strict";t.r(e);var u=t("e136"),o=t("ecc6");for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);t("05f8");var i,r=t("0095"),a=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"0a3211fc",null,!1,u["a"],i);e["default"]=a.exports},ea96:function(n,e,t){},ecc6:function(n,e,t){"use strict";t.r(e);var u=t("8ca5"),o=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);e["default"]=o.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'admin/order/components/sel-mention-create-component',
     {

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

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

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

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

hdApp/dist/build/mp-weixin/components/app-result.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

hdApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

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

hdApp/dist/build/mp-weixin/pagesPurchase/components/gatheringList.json

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

hdApp/dist/build/mp-weixin/pagesStorehouse/inventory/list.wxml

@@ -1 +1 @@
-<view class="allot-ex-page data-v-2e8a1214"><view class="tabs data-v-2e8a1214"><tabs vue-id="0706b49b-1" tabs="{{tabs}}" currentTab="{{tabIndex}}" itemWidth="33.33%" data-event-opts="{{[['^change',[['changeTabEvent']]],['^add',[['addEvent']]]]}}" bind:change="__e" bind:add="__e" class="data-v-2e8a1214" bind:__l="__l"></tabs></view><scroll-view class="allot-list data-v-2e8a1214" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-2e8a1214"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetailsEvent',['$0'],[[['list.data','',index]]]]]]]}}" class="allot-item data-v-2e8a1214" bindtap="__e"><view class="info data-v-2e8a1214"><view class="info-order data-v-2e8a1214">{{item.orderSn}}</view><view class="info-name data-v-2e8a1214">{{item.remark}}</view><view class="data-v-2e8a1214"><text class="info-time data-v-2e8a1214">{{item.updateTime}}</text><block wx:if="{{item.bigNum>=0}}"><text class="data-v-2e8a1214">{{item.bigNum+'/'}}</text></block><text class="data-v-2e8a1214">{{item.smallNum}}</text>件</view></view><view class="{{['data-v-2e8a1214','status',item.status==INVENTORY_STATUS.DRAFT?'primary':'gray']}}"><view class="{{['data-v-2e8a1214','iconfont',item.status==INVENTORY_STATUS.DONE?'iconxuanzhong':'iconbianji']}}"></view></view></view></block></block></block><block wx:else><block class="data-v-2e8a1214"><app-wrapper-empty vue-id="0706b49b-2" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-2e8a1214" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><view class="app-footer open_btn _div data-v-2e8a1214"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue _div data-v-2e8a1214" bindtap="__e">新增盘点</view></view><kd-entrance vue-id="0706b49b-3" class="data-v-2e8a1214" bind:__l="__l"></kd-entrance></view>
+<view class="allot-ex-page data-v-f45f09ae"><view class="tabs data-v-f45f09ae"><tabs vue-id="0706b49b-1" tabs="{{tabs}}" currentTab="{{tabIndex}}" itemWidth="33.33%" data-event-opts="{{[['^change',[['changeTabEvent']]],['^add',[['addEvent']]]]}}" bind:change="__e" bind:add="__e" class="data-v-f45f09ae" bind:__l="__l"></tabs></view><scroll-view class="allot-list data-v-f45f09ae" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-f45f09ae"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetailsEvent',['$0'],[[['list.data','',index]]]]]]]}}" class="allot-item data-v-f45f09ae" bindtap="__e"><view class="info data-v-f45f09ae"><view class="info-order data-v-f45f09ae">{{item.orderSn}}</view><view class="info-name data-v-f45f09ae">{{item.remark}}</view><view class="data-v-f45f09ae"><text class="info-time data-v-f45f09ae">{{item.updateTime}}</text><block wx:if="{{item.bigNum>=0}}"><text class="data-v-f45f09ae">{{item.bigNum+'/'}}</text></block><text class="data-v-f45f09ae">{{item.smallNum}}</text>件</view></view><view class="{{['data-v-f45f09ae','status',item.status==INVENTORY_STATUS.DRAFT?'primary':'gray']}}"><view class="{{['data-v-f45f09ae','iconfont',item.status==INVENTORY_STATUS.DONE?'iconxuanzhong':'iconbianji']}}"></view></view></view></block></block></block><block wx:else><block class="data-v-f45f09ae"><app-wrapper-empty vue-id="0706b49b-2" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-f45f09ae" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><view class="app-footer open_btn _div data-v-f45f09ae"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue _div data-v-f45f09ae" bindtap="__e">新增盘点</view></view></view>

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -158,8 +158,8 @@ export default {
 			showSubmitModel: false,
 			notOpenShop:false,
 			hdShopAdminId:0,
-      pageInfo: {},
-      myClass: 'fadeIn'
+			pageInfo: {},
+			myClass: 'fadeIn'
 		};
 	},
 	computed: {

hdApp/src/pagesPurchase/purDetails.vue

@@ -6,14 +6,14 @@
       </view>
       <view class="address-des_bx content-box">
         <view>
-          <view> {{ detailInfo.supplierName }} {{ detailInfo.supplierMobile }} </view>
+          <view> {{ detailInfo.ghsName }} {{ detailInfo.ghsMobile }} </view>
           <view class="">
-            {{ detailInfo.supplierAddress}}
+            {{ detailInfo.ghsFullAddress}}
           </view>
         </view>
         <view>
           <i
-            @click="callUp(detailInfo.supplierMobile)"
+            @click="callUp(detailInfo.ghsMobile)"
             class="iconfont icondianhua1"
           ></i>
         </view>

hdApp/src/pagesStorehouse/inventory/list.vue

@@ -49,7 +49,6 @@
 		<div class="app-footer open_btn">
 			<div @click="addEvent" class="admin-button-com middle blue">新增盘点</div>
 		</div>
-    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>