Merge branch 'dev' of https://gitea.lihaink.cn/weipengfei/purchase-let into product

config/app.js

@@ -3,9 +3,9 @@ let WSS_URL
 import store from "@/store/user.js"
 // 环境
 // let env = "dev"
-// let env = "prod"
+let env = "prod"
 // let env = "release";
-let env = "local";
+// let env = "local";
 
 switch (env) {
 	case 'dev':

pages/index/index.vue

@@ -182,6 +182,10 @@
 								<view class="shop-content-li-r" style="color:#FC452F ;">￥<text
 										style="font-size: 28rpx;">{{item[priceKey.op_price]}}</text>
 								</view>
+								<view class="tag" v-if="item.tag">
+									<view class="icon" />
+									{{item.tag}}
+								</view>
 							</view>
 
 							<view class="shop-content-li" style="justify-content: space-between;"
@@ -202,7 +206,8 @@
 								</view> -->
 							</view>
 							<view class="shopconetent-btn">
-								<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
+								<u--icon name="plus-circle-fill" size="20" color="#20b128" v-if="item.is_lack==0"></u--icon>
+								<u--icon name="plus-circle-fill" size="20" color="#c1ffc0" v-else></u--icon>
 							</view>
 						</view>
 					</view>
@@ -648,6 +653,9 @@
 	const goodRef = ref(null);
 	const goodData = ref({});
 	const openGoodPopup = (item) => { // 打开数量/重量弹窗
+		if(item.is_lack==1){
+			return false
+		}
 		navTo(false)
 		if (!userStore.token || !userStore.userInfo.mobile) return;
 		goodData.value = item;