更新

ghsApp/src/admin/home/me.vue

@@ -138,22 +138,22 @@
         <view class="module-com content_box user-open_bx">
           <view class="input-line-wrap">
 
-            <tui-list-cell @click="pageTo({ url: '/admin/home/shopInviteHub' })" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
-              <view class="tui-title">邀请开店</view>
+            <tui-list-cell @click="pageTo({ url: '/admin/shop/changeShop' })" class="line-cell" :hover="false" :arrow="true" v-if="getLoginInfo.lookAllShop && getLoginInfo.lookAllShop == 1" >
+              <view class="tui-title">管理商家</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/showShop' })" class="line-cell" :hover="false" :arrow="true" v-if="getLoginInfo.lookAllShop && getLoginInfo.lookAllShop == 1" >
               <view class="tui-title">营业商家</view>
             </tui-list-cell>
 
-            <tui-list-cell @click="pageTo({ url: '/admin/shop/changeShop' })" class="line-cell" :hover="false" :arrow="true" v-if="getLoginInfo.lookAllShop && getLoginInfo.lookAllShop == 1" >
-              <view class="tui-title">管理商家</view>
-            </tui-list-cell>
-
             <tui-list-cell @click="pageTo({ url: '/pagesClient/member/addCustom' })" class="line-cell" :hover="false" :arrow="true" v-if="getLoginInfo.lookAllShop && getLoginInfo.lookAllShop == 1" >
               <view class="tui-title">虚拟客户</view>
             </tui-list-cell>
 
+            <tui-list-cell @click="pageTo({ url: '/admin/home/shopInviteHub' })" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
+              <view class="tui-title">邀请开店</view>
+            </tui-list-cell>
+
             <!-- <tui-list-cell @click="pageTo({ url: '/pagesStore/me/income' })" class="line-cell" :hover="false" :arrow="true" >
               <view class="tui-title">收入明细</view>
             </tui-list-cell>

ghsApp/src/admin/shop/changeShop.vue

@@ -1,8 +1,10 @@
 <template>
 <view class="app-content">
 	<view class="ex-page">
-		<view class="top-bar" style="display: flex;align-items:center;">
-			<input v-model="name" type="text" @input="searchShop" @focus="name=''" style="border:1upx solid #CCCCCC;width:300upx;height:65upx;margin:0 auto;text-align:center;" />
+		<!-- 输入后点搜索才请求，避免边输边查 -->
+		<view class="top-bar" style="display: flex;align-items:center;justify-content:center;">
+			<input v-model="name" type="text" confirm-type="search" @focus="name=''" style="border:1upx solid #CCCCCC;width:300upx;height:65upx;text-align:center;" />
+			<button class="admin-button-com middle blue search-btn" @click="searchShop">搜索</button>
 		</view>
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
@@ -50,6 +52,7 @@ export default {
 	methods: {
 		init(){
 		},
+		/** 点搜索按钮后按店名查可切换门店，空关键字不请求 */
 		searchShop(){
 			if(!this.$util.isEmpty(this.name)){
 				this.showShop()
@@ -92,6 +95,9 @@ export default {
 		width: 100%;
 		top:20upx;
 		z-index: 20;
+		.search-btn {
+			margin-left: 16upx;
+		}
 		.bar{
 			width: 50%;
 			height: 100%;

ghsApp/src/pagesPurchase/details.vue

@@ -178,7 +178,7 @@
 
 					<!-- 送货时间写入 sendTime，可选手动补录；空则后端按当天落库 -->
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title">发货时间</view>
+						<view class="tui-title">{{Number(pfLevel)==0?'发货时间':'送货时间'}}</view>
 						<view class="uni-input" v-if="form.sendTime == ''" style="color: #cccccc; width: 400upx; font-size: 32upx" @click="bindSendTimeChange">默认当天</view>
 						<view class="uni-input" @click="bindSendTimeChange" v-else style="width: 400upx; font-size: 32upx">{{ form.sendTime }}</view>
 					</tui-list-cell>
@@ -302,6 +302,7 @@ export default {
 			globalCheckStock:false,
 			cgUnitType:0,
 			showButton:[{text: '取消',plain: true}, {text: '确定',plain: false}],
+			pfLevel:0,
 		};
 	},
 	onLoad() {
@@ -338,6 +339,7 @@ export default {
 		getShopInfoApi().then(res=>{
 			if(res.code == 1){
 				that.cgUnitType = res.data.shopInfo && res.data.shopInfo.cgUnitType ? res.data.shopInfo.cgUnitType : 0
+				that.pfLevel = res.data.shopInfo && res.data.shopInfo.pfLevel ? res.data.shopInfo.pfLevel : 0
 			}
 		})
 

ghsApp/src/pagesPurchase/info.vue

@@ -124,10 +124,10 @@
 					>申请售后</button>
 				</view>
 			</view>
-			<view style="text-align: right;" v-if="detailInfo.pfLevel && detailInfo.pfLevel == 1">
+			<!-- <view style="text-align: right;" v-if="detailInfo.pfLevel && detailInfo.pfLevel == 1">
 				<button @tap="assignOrder()" class="admin-button-com middle blue" style="">刷新货位</button>
 				<button @tap="changeView()" class="admin-button-com middle blue" style="margin-left:50upx;">{{showSeat == 0 ?'显示货位':'隐藏货位'}}</button>
-			</view>
+			</view> -->
 			<view class="module-com content-box">
 				<view class="commodity-view">
 					<view class="commodity-list">