1

pages/index/index.vue

@@ -350,7 +350,9 @@
 			},
 			onClickArea(item) {
 				uni.setStorageSync('shopId', item.shop.id)
+				uni.setStorageSync('shopMerchantType', item.shop.merchantType)
 				uni.setStorageSync('area', JSON.stringify(item))
+				console.log('1111111111111111',uni.getStorageSync('shopMerchantType'))
 				this.getBusinessStatus()
 				this.getData()
 

pages/login/login.vue

@@ -342,6 +342,7 @@
 								uni.setStorageSync('shopAddress',res.result.shopAddress)
 								uni.setStorageSync('shopRemark',res.result.remark)
 								uni.setStorageSync('shopScore',item.shop.shopScore)
+								uni.setStorageSync('shopMerchantType', item.shop.merchantType)
 								uni.setStorageSync("shopOwnerPhone", item.shopOwnerPhone)
 								uni.setStorageSync('schoolShop',res.result.shop)
 								uni.setStorageSync('schoolShop',res.result.shop)
@@ -351,7 +352,7 @@
 								uni.setStorageSync("isShop",true)
 								setTimeout(() => {
 									uni.reLaunch({
-										url: '../worker/index'
+										url: '../index/index'
 									})
 								}, 200)
 								uni.showToast('登录成功', 2000, true)

pages/shop/addGoods.vue

@@ -99,11 +99,17 @@
 					<view style="line-height: 74rpx;">
 						<radio :checked="formData.isMoreBuy==0" name="isMoreBuy" @click="checkisMoreBuy('0')" />否
 						<radio :checked="formData.isMoreBuy==1" name="isMoreBuy" @click="checkisMoreBuy('1')" />是
+						<view style="font-size: 24rpx;color: #999;line-height: 36rpx;">
+							拼团商品下单时可搭配该商品一并下单
+						</view>
 					</view>
 				</uni-forms-item>
-				<uni-forms-item label="餐盒费" name="lunchBox">
-					<input type="digit" class="content-input" v-model="formData.lunchBox" placeholder="请输入餐盒费">
-				</uni-forms-item>
+				<view id="lunchBoxField" v-if="shopMerchantType == 1 && formData.isMoreBuy==0">
+					<uni-forms-item label="餐盒费" name="lunchBox">
+						<input type="digit" class="content-input" v-model="formData.lunchBox" placeholder="请输入餐盒费"
+							:adjust-position="false" :cursor-spacing="160" @focus="focusFormField('lunchBoxField')" @blur="blurFormField">
+					</uni-forms-item>
+				</view>
 				<uni-forms-item label="起售数量" name="startPayNum">
 					<input type="digit" class="content-input" v-model="formData.startPayNum" placeholder="请输入起售数量">
 				</uni-forms-item>
@@ -161,6 +167,7 @@
 				dataList: {},
 				modalType:0,
 				maxSelect:1,
+				shopMerchantType:0,
 				currentCanbuy:1,
 				canbuyMap:{},
 				categoryData:[],
@@ -217,6 +224,7 @@
 		},
 		onShow() {
 			this.attrId = uni.getStorageSync('attrId');
+			this.shopMerchantType = uni.getStorageSync('shopMerchantType');
 			this.typeItem = JSON.parse(JSON.stringify(this.typeItem)) || ''
 			if (this.typeItem) {
 				this.formData.categoryId = this.typeItem.id

pages/shop/goodsList.vue

@@ -137,7 +137,6 @@
 			<view class="bottom-btn" @tap="goDetail('goods')" style="background: rgba(0, 35, 28, 1);color: rgba(166, 255, 234, 1);">新增商品</view>
 			<view class="bottom-btn" @tap="$refs.payDialog.open()">更多</view>
 		</view>
-		<u-loadmore :status="status" />
 		<!-- 弹出输入框 -->
 		<uni-popup ref="payDialog" background-color="#fff">
 			<view class="popup-pay-content">