2024-6-27

components/productWindow/index.vue

@@ -17,22 +17,29 @@
 					<view class="money font-color">
 						<view class="acea-row row-middle">
 							<text v-if="type =='points'">
-								<text v-if="parseFloat(attr.productSelect.integral)"><text class="num">{{ attr.productSelect.integral }}</text>积分</text>
-								<text v-if="parseFloat(attr.productSelect.price) && parseFloat(attr.productSelect.integral)">+</text>
-								<text v-if="parseFloat(attr.productSelect.price)">￥<text class="num">{{ attr.productSelect.price }}</text></text>
+								<text v-if="parseFloat(attr.productSelect.integral)"><text
+										class="num">{{ attr.productSelect.integral }}</text>积分</text>
+								<text
+									v-if="parseFloat(attr.productSelect.price) && parseFloat(attr.productSelect.integral)">+</text>
+								<text v-if="parseFloat(attr.productSelect.price)">￥<text
+										class="num">{{ attr.productSelect.price }}</text></text>
 							</text>
 							<text v-else>￥<text class="num">{{ attr.productSelect.price }}</text></text>
 							<text class='vip-money'
 								v-if="is_vip>0 && attr.productSelect.vip_price && storeInfo && storeInfo.price_type == 'member'">￥{{attr.productSelect.vip_price}}</text>
-							<view class="vipImg" v-if="is_vip>0 && attr.productSelect.vip_price && storeInfo && storeInfo.price_type == 'member'">
+							<view class="vipImg"
+								v-if="is_vip>0 && attr.productSelect.vip_price && storeInfo && storeInfo.price_type == 'member'">
 								<image src="../../static/images/vip.png"></image>
 							</view>
-							
-							<view class="icon" v-if="is_vip>0 && attr.productSelect.vip_price && storeInfo && storeInfo.price_type == 'level'"><text class="iconfont icon-dengjitubiao"></text>{{storeInfo.level_name}}</view>
-							
+
+							<view class="icon"
+								v-if="is_vip>0 && attr.productSelect.vip_price && storeInfo && storeInfo.price_type == 'level'">
+								<text class="iconfont icon-dengjitubiao"></text>{{storeInfo.level_name}}</view>
+
 						</view>
 						<text class="stock" v-if='isShow'>库存: {{ attr.productSelect.stock }}</text>
-						<text class='stock' v-if="limitNum">{{type == 'seckill' ? '限量' : type == 'points'?'剩余':'库存'}}: {{attr.productSelect.quota}}</text>
+						<text class='stock' v-if="limitNum">{{type == 'seckill' ? '限量' : type == 'points'?'剩余':'库存'}}:
+							{{attr.productSelect.quota}}</text>
 						<slot name="bottom" :attr="attr"></slot>
 					</view>
 				</view>
@@ -51,12 +58,16 @@
 						</view>
 					</view>
 					<view class="item" v-if="isDelivery">
-						 <view class="title">配送方式</view>
-						 <view class="listn acea-row row-middle">
-							 <view class="itemn" v-if="attr.deliveryType.includes('1')" @click="getstoreInfo('1')" :class="flag==1?'on':isStoreBuy?'on2':''">商城配送</view>
-							 <view class="itemn" v-if="attr.deliveryType.includes('2') && attr.store_self_mention && selfStoreList.length" @click="getstoreInfo('2')" :class="flag==2?'on':''">门店自提</view>
-							 <view class="itemn" v-if="attr.deliveryType.includes('3') && storeList.length" @click="getstoreInfo('3')" :class="flag==3?'on':''">门店配送</view>
-						 </view>
+						<view class="title">配送方式</view>
+						<view class="listn acea-row row-middle">
+							<view class="itemn" v-if="attr.deliveryType.includes('1')" @click="getstoreInfo('1')"
+								:class="flag==1?'on':isStoreBuy?'on2':''">商城配送</view>
+							<view class="itemn"
+								v-if="attr.deliveryType.includes('2') && attr.store_self_mention && selfStoreList.length"
+								@click="getstoreInfo('2')" :class="flag==2?'on':''">门店自提</view>
+							<view class="itemn" v-if="attr.deliveryType.includes('3') && storeList.length"
+								@click="getstoreInfo('3')" :class="flag==3?'on':''">门店配送</view>
+						</view>
 					</view>
 					<view class="address acea-row row-middle" v-if="flag ==1 && isDelivery" @click="openAddress">
 						<view class="adsInfo">{{addressInfo}}</view>
@@ -66,19 +77,21 @@
 						<view class="adsInfo">{{deliveryName}}{{deliveryAddress}}{{distance}}</view>
 						<view class="iconfont icon-gengduo3" v-if="attr.isType != 1"></view>
 					</view>
-					<view class="address" v-if="flag ==2 && isDelivery"  @click="openStore">
+					<view class="address" v-if="flag ==2 && isDelivery" @click="openStore">
 						<view>{{deliveryName}}</view>
 						<view class="info acea-row row-between-wrapper">
 							<view class="con">{{deliveryAddress}}</view>
-							<view>{{distance}}<text class="iconfont icon-gengduo3" v-if="attr.isType != 1"></text></view>
+							<view>{{distance}}<text class="iconfont icon-gengduo3" v-if="attr.isType != 1"></text>
+							</view>
 						</view>
 					</view>
 				</view>
 				<view class="cart acea-row row-between-wrapper" v-if="type != 'setMeal' && type !='points'">
-				  <view class="title">数量</view>
+					<view class="title">数量</view>
 					<view class="carnum acea-row row-left">
 						<view class="item reduce acea-row row-center-wrapper"
-							:class="attr.productSelect.cart_num <= 1 ? 'on' : ''" v-if="attr.productSelect.cart_num <= 1">
+							:class="attr.productSelect.cart_num <= 1 ? 'on' : ''"
+							v-if="attr.productSelect.cart_num <= 1">
 							<text class="iconfont icon-shangpinshuliang-jian"></text>
 						</view>
 						<view class="item reduce acea-row row-center-wrapper"
@@ -87,8 +100,8 @@
 						</view>
 						<view class='item num acea-row row-middle'>
 							<input type="number" v-model="attr.productSelect.cart_num"
-								data-name="productSelect.cart_num" :always-embed="true" :adjust-position="true" cursor-spacing="30"
-								@input="bindCode(attr.productSelect.cart_num)"></input>
+								data-name="productSelect.cart_num" :always-embed="true" :adjust-position="true"
+								cursor-spacing="30" @input="bindCode(attr.productSelect.cart_num)"></input>
 						</view>
 						<view v-if="iSplus" class="item plus acea-row row-center-wrapper" :class="
 				      attr.productSelect.cart_num >= attr.productSelect.stock
@@ -113,10 +126,11 @@
 			<view class="joinBnt on" v-else-if="iScart && !attr.productSelect.stock">已售罄</view>
 		</view>
 		<!-- 选择门店 -->
-    <view class="product-window" :class="isStore?'store':''">
+		<view class="product-window" :class="isStore?'store':''">
 			<view class="storeTitle">选择门店<text class="iconfont icon-guanbi5" @click="closeStore"></text></view>
 			<view class="storeList">
-				<view class="item" :class="active == index?'on':''" v-for="(item,index) in storeList" :key="index" @click="tapStore(index,item)">
+				<view class="item" :class="active == index?'on':''" v-for="(item,index) in storeList" :key="index"
+					@click="tapStore(index,item)">
 					<view class="name line1">{{item.name}}</view>
 					<view class="address acea-row row-between">
 						<view class="iconfont icon-dingwei2"></view>
@@ -129,18 +143,23 @@
 					<view class="iconfont icon-xuanzhong6" v-if="active == index"></view>
 				</view>
 			</view>
-    </view>
-    <addressWindow ref="addressWindow" :isFooter="isFooter" :pagesUrl="pagesUrl" :fromType="1" :address="address" @changeClose="changeClose" @OnChangeAddress="OnChangeAddress">
-    </addressWindow>
+		</view>
+		<!-- <addressWindow ref="addressWindow" :isFooter="isFooter" :pagesUrl="pagesUrl" :fromType="1" :address="address"
+			@changeClose="changeClose" @OnChangeAddress="OnChangeAddress">
+		</addressWindow> -->
 		<view class="mask" @touchmove.prevent :hidden="attr.cartAttr === false" @click="closeAttr"></view>
 		<view class="mask on" @touchmove.prevent :hidden="isStore === false" @click="closeStore"></view>
 	</view>
 </template>
 
 <script>
-  import addressWindow from '@/components/addressWindow';
-  import {getAddressList} from '@/api/user.js'
-  import {storeListApi} from '@/api/store.js'
+	import addressWindow from '@/components/addressWindow';
+	import {
+		getAddressList
+	} from '@/api/user.js'
+	import {
+		storeListApi
+	} from '@/api/store.js'
 	import {
 		mapGetters,
 		mapState
@@ -152,8 +171,8 @@
 			}),
 			...mapGetters(['isLogin'])
 		},
-		components:{
-		  addressWindow
+		components: {
+			addressWindow
 		},
 		props: {
 			isStoreBuy: {
@@ -213,38 +232,38 @@
 				default: ''
 			},
 			isFooter: {
-			  type: Boolean,
-			  default: false
+				type: Boolean,
+				default: false
 			}
 		},
 		data() {
 			return {
-        flag:1,
-        addressInfo:'', // 商城快递
-        deliveryName:'', // 门店配送
-				distance:'',
-				deliveryAddress:'',
+				flag: 1,
+				addressInfo: '', // 商城快递
+				deliveryName: '', // 门店配送
+				distance: '',
+				deliveryAddress: '',
 				address: {
 					address: false
 				},
-				pagesUrl:'',
-			 user_latitude: 0,
-			 user_longitude: 0,
-			 isDelivery: false,
-			 storeList: [],
-			 deliveryStoreList: [],
-			 selfStoreList: [],
-			 active:0,
-			 isStore: false
-      }
+				pagesUrl: '',
+				user_latitude: 0,
+				user_longitude: 0,
+				isDelivery: false,
+				storeList: [],
+				deliveryStoreList: [],
+				selfStoreList: [],
+				active: 0,
+				isStore: false
+			}
 		},
-    
+
 		mounted() {
-		 try {
-		 	this.user_latitude = uni.getStorageSync('user_latitude');
-		 	this.user_longitude = uni.getStorageSync('user_longitude');
-		 } catch (e) {}
-    },
+			try {
+				this.user_latitude = uni.getStorageSync('user_latitude');
+				this.user_longitude = uni.getStorageSync('user_longitude');
+			} catch (e) {}
+		},
 		watch: {
 			// 'attr.deliveryType': {
 			// 	handler(newV) {
@@ -265,7 +284,7 @@
 			'attr.deliveryType'(newValue, oldValue) {
 				if (JSON.stringify(newValue) != JSON.stringify(oldValue)) {
 					if (newValue.length) {
-						if(this.active<1){
+						if (this.active < 1) {
 							this.getList();
 							// if (this.user_latitude && this.user_longitude) {
 							// 	this.getList();
@@ -274,43 +293,44 @@
 							// }
 						}
 						let num = 1;
-						if(newValue[0] == 1 && this.isStoreBuy){
+						if (newValue[0] == 1 && this.isStoreBuy) {
 							num = newValue[1];
-						}else{
+						} else {
 							num = newValue[0];
 						}
 						this.flag = num
-						this.$emit('deliveryFun',num);
+						this.$emit('deliveryFun', num);
 					}
 				}
 			}
 		},
 		methods: {
-			closeStore(){
+			closeStore() {
 				this.isStore = false;
 			},
-			openStore(){
-				if(this.attr.isType != 1){
+			openStore() {
+				if (this.attr.isType != 1) {
 					this.isStore = true;
 				}
 			},
 			// 切换门店
-				tapStore(index,item){
-					this.active = index;
-					this.deliveryName = item.name;
-					this.deliveryAddress = item.detailed_address+'\xa0';
-					this.distance = '距您'+item.range+'km';
-					this.isStore = false;
-					this.$emit('onstoreId',item,this.flag);
-				},
-				// 切换地址
-				OnChangeAddress: function(e,row) {
-				  this.address.address = false;
-					this.addressInfo = row.province+'省'+'\xa0'+row.city+'\xa0'+row.district+'\xa0'+row.street+'\xa0'+row.detail
-					this.$emit('onAddressId',row)
-				},
-				// 打开弹窗
-			openAddress(){
+			tapStore(index, item) {
+				this.active = index;
+				this.deliveryName = item.name;
+				this.deliveryAddress = item.detailed_address + '\xa0';
+				this.distance = '距您' + item.range + 'km';
+				this.isStore = false;
+				this.$emit('onstoreId', item, this.flag);
+			},
+			// 切换地址
+			OnChangeAddress: function(e, row) {
+				this.address.address = false;
+				this.addressInfo = row.province + '省' + '\xa0' + row.city + '\xa0' + row.district + '\xa0' + row
+					.street + '\xa0' + row.detail
+				this.$emit('onAddressId', row)
+			},
+			// 打开弹窗
+			openAddress() {
 				this.$refs.addressWindow.getAddressList();
 				this.address.address = true;
 				this.pagesUrl = '/pages/users/user_address/index'
@@ -318,24 +338,25 @@
 			goCat: function() {
 				this.$emit('goCat');
 			},
-      // 配送地址
-      getAddressList() {
-        getAddressList({
+			// 配送地址
+			getAddressList() {
+				getAddressList({
 					page: 1,
 					limit: 1
-				}).then(res=>{
+				}).then(res => {
 					let data = res.data[0];
-					if(res.data.length){
-						 this.addressInfo = data.province+'省'+'\xa0'+data.city+'\xa0'+data.district+'\xa0'+data.street+'\xa0'+data.detail
-						 this.$emit('onAddressId',data)
-					}else{
+					if (res.data.length) {
+						this.addressInfo = data.province + '省' + '\xa0' + data.city + '\xa0' + data.district +
+							'\xa0' + data.street + '\xa0' + data.detail
+						this.$emit('onAddressId', data)
+					} else {
 						this.addressInfo = '点击添加地址'
 					}
-        })
-      },
+				})
+			},
 			// 关闭地址弹窗；
 			changeClose: function() {
-			  this.$set(this.address, 'address', false);
+				this.$set(this.address, 'address', false);
 			},
 			selfLocation() {
 				let self = this
@@ -361,13 +382,14 @@
 							} catch {}
 							self.getList();
 						},
-						fail:(res)=>{
+						fail: (res) => {
 							console.log(res)
 							// #ifdef MP
 							uni.getSetting({
-								success: res=>{
-									if(typeof(res.authSetting['scope.userLocation']) != 'undefined' && !res.authSetting['scope.userLocation']){
-									  uni.setStorageSync('refuseLocation', true);
+								success: res => {
+									if (typeof(res.authSetting['scope.userLocation']) !=
+										'undefined' && !res.authSetting['scope.userLocation']) {
+										uni.setStorageSync('refuseLocation', true);
 									}
 								}
 							})
@@ -388,32 +410,33 @@
 					page: 1,
 					limit: 100,
 					product_id: this.productId,
-					is_store:'',   //查找所有门店列表
-					type: this.type == 'seckill'?1:0,
-					store_id: id?id:this.nearbyStore
+					is_store: '', //查找所有门店列表
+					type: this.type == 'seckill' ? 1 : 0,
+					store_id: id ? id : this.nearbyStore
 				};
 				storeListApi(data)
 					.then(res => {
 						let list = res.data.list.list;
-						if(!id && list.length && this.attr && ((this.attr.deliveryType.indexOf('2') != -1 && this.attr.store_self_mention) || this.attr.deliveryType.indexOf('3') != -1)){
+						if (!id && list.length && this.attr && ((this.attr.deliveryType.indexOf('2') != -1 && this
+								.attr.store_self_mention) || this.attr.deliveryType.indexOf('3') != -1)) {
 							this.isDelivery = true;
-							if(this.$store.getters.isLogin){
+							if (this.$store.getters.isLogin) {
 								this.getAddressList()
 							}
 						}
 						// 拆分自提门店列表和配送门店列表
 						let selfStoreList = [];
-						list.forEach(function(item,index){
-							if(item.is_store === 1) selfStoreList.push(item);
+						list.forEach(function(item, index) {
+							if (item.is_store === 1) selfStoreList.push(item);
 						});
-						this.storeList = this.flag==2?selfStoreList:list;
-						this.selfStoreList = selfStoreList;//门店自提
-						this.deliveryStoreList = list;//门店配送
+						this.storeList = this.flag == 2 ? selfStoreList : list;
+						this.selfStoreList = selfStoreList; //门店自提
+						this.deliveryStoreList = list; //门店配送
 						this.active = 0;
 						this.deliveryName = list[0].name;
-						this.deliveryAddress = list[0].detailed_address+'\xa0';
-						this.distance = '距您'+list[0].range+'km';
-						this.$emit('onstoreId',list[0],this.flag);
+						this.deliveryAddress = list[0].detailed_address + '\xa0';
+						this.distance = '距您' + list[0].range + 'km';
+						this.$emit('onstoreId', list[0], this.flag);
 					})
 					.catch(err => {
 						this.$util.Tips({
@@ -463,89 +486,98 @@
 				}
 				return value;
 			},
-		  // 选择配送方式
-		  getstoreInfo(index) {
-					if(index == 1 && this.isStoreBuy){
-						return false
-					}
-					if(index === '2' || index === '3'){
-						if ((!this.user_latitude || !this.user_longitude) && !uni.getStorageSync('refuseLocation')) {
-							this.selfLocation();
-						}
+			// 选择配送方式
+			getstoreInfo(index) {
+				if (index == 1 && this.isStoreBuy) {
+					return false
+				}
+				if (index === '2' || index === '3') {
+					if ((!this.user_latitude || !this.user_longitude) && !uni.getStorageSync('refuseLocation')) {
+						this.selfLocation();
 					}
-					if(index === '2') this.storeList = this.selfStoreList; //门店自提
-					if(index === '3') this.storeList = this.deliveryStoreList; //门店配送
-					this.flag = index;
-					this.active = 0;
-					this.deliveryName = this.storeList[0].name;
-					this.deliveryAddress = this.storeList[0].detailed_address+'\xa0';
-					this.distance = '距您'+this.storeList[0].range+'km';
-					this.$emit('deliveryFun',index);
-					this.$emit('onstoreId',this.storeList[0],index);
-		  },
-		  showLocation(){
-			  if ((!this.user_latitude || !this.user_longitude) && !uni.getStorageSync('refuseLocation')) {
-			  	this.selfLocation();
-			  }
-		  },
-		  showImg() {
-		  	this.$emit('getImg');
-		  }
+				}
+				if (index === '2') this.storeList = this.selfStoreList; //门店自提
+				if (index === '3') this.storeList = this.deliveryStoreList; //门店配送
+				this.flag = index;
+				this.active = 0;
+				this.deliveryName = this.storeList[0].name;
+				this.deliveryAddress = this.storeList[0].detailed_address + '\xa0';
+				this.distance = '距您' + this.storeList[0].range + 'km';
+				this.$emit('deliveryFun', index);
+				this.$emit('onstoreId', this.storeList[0], index);
+			},
+			showLocation() {
+				if ((!this.user_latitude || !this.user_longitude) && !uni.getStorageSync('refuseLocation')) {
+					this.selfLocation();
+				}
+			},
+			showImg() {
+				this.$emit('getImg');
+			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-	.mask.on{
+	.mask.on {
 		z-index: 100 !important;
 	}
-	.product-window{
-		 .productWinList{
-			 .address{
-				 width: 690rpx;
-				 background: #F5F5F5;
-				 padding: 30rpx 24rpx;
-				 margin: 0 auto;
-				 margin-top: 20rpx;
-				 font-weight: 400;
-				 color: #333333;
-				 font-size: 26rpx;
-				 border-radius: 10rpx;
-				 .adsInfo{
-					 max-width: 594rpx;
-				 }
-				 .iconfont{
-					 font-size: 18rpx;
-					 margin-left: 12rpx;
-				 }
-				 .info{
-					 font-weight: 400;
-					 color: #999999;
-					 margin-top: 12rpx;
-					 .con{
-						 width: 416rpx;
-					 }
-				 }
-			 }
-		 }
-	}
-  .active {
-    position: relative;
-    border: 1px solid var(--view-theme);
-    .icon-xuanzhong6 {
-      font-size: 46rpx;
-      position: absolute;
-      bottom: -4rpx;
-      right: -6rpx;
-      color: var(--view-theme);
-    }
-  }
+
+	.product-window {
+		.productWinList {
+			.address {
+				width: 690rpx;
+				background: #F5F5F5;
+				padding: 30rpx 24rpx;
+				margin: 0 auto;
+				margin-top: 20rpx;
+				font-weight: 400;
+				color: #333333;
+				font-size: 26rpx;
+				border-radius: 10rpx;
+
+				.adsInfo {
+					max-width: 594rpx;
+				}
+
+				.iconfont {
+					font-size: 18rpx;
+					margin-left: 12rpx;
+				}
+
+				.info {
+					font-weight: 400;
+					color: #999999;
+					margin-top: 12rpx;
+
+					.con {
+						width: 416rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.active {
+		position: relative;
+		border: 1px solid var(--view-theme);
+
+		.icon-xuanzhong6 {
+			font-size: 46rpx;
+			position: absolute;
+			bottom: -4rpx;
+			right: -6rpx;
+			color: var(--view-theme);
+		}
+	}
+
 	.vip-money {
 		color: #282828;
 		font-size: 28rpx;
 		font-weight: 700;
 		margin-left: 6rpx;
 	}
+
 	.vipImg {
 		width: 56rpx;
 		height: 20rpx;
@@ -557,16 +589,17 @@
 			display: block;
 		}
 	}
-	
-	.product-window{
-		&.store{
+
+	.product-window {
+		&.store {
 			background-color: #F5F5F5;
 			border-radius: 20rpx 20rpx 0 0;
 			transform: translate3d(0, 0, 0);
 			z-index: 102;
 			margin: 0;
 		}
-		.storeTitle{
+
+		.storeTitle {
 			text-align: center;
 			height: 100rpx;
 			line-height: 100rpx;
@@ -574,16 +607,19 @@
 			font-weight: 500;
 			color: #282828;
 			position: relative;
-			.iconfont{
+
+			.iconfont {
 				position: absolute;
 				font-size: 35rpx;
 				right: 30rpx;
 			}
 		}
-		.storeList{
+
+		.storeList {
 			max-height: 690rpx;
 			overflow: auto;
-			.item{
+
+			.item {
 				width: 690rpx;
 				background: #FFFFFF;
 				border-radius: 12rpx;
@@ -591,42 +627,50 @@
 				padding: 28rpx 30rpx;
 				border: 1px solid #fff;
 				position: relative;
-				&.on{
+
+				&.on {
 					border-color: var(--view-theme);
 				}
-				.icon-xuanzhong6{
+
+				.icon-xuanzhong6 {
 					position: absolute;
 					right: -6rpx;
 					bottom: -6rpx;
 					color: var(--view-theme);
 					font-size: 54rpx;
 				}
-				.name{
+
+				.name {
 					font-weight: 500;
 					color: #333333;
 					font-size: 28rpx;
 				}
-				.time{
+
+				.time {
 					font-weight: 400;
 					color: #888888;
 					font-size: 22rpx;
 					margin-top: 15rpx;
-					.iconfont{
+
+					.iconfont {
 						font-size: 20rpx;
 						margin-right: 8rpx;
 					}
 				}
-				.address{
+
+				.address {
 					font-weight: 400;
 					color: #888888;
 					font-size: 22rpx;
 					margin-top: 13rpx;
-					.iconfont{
+
+					.iconfont {
 						font-size: 20rpx;
 						margin-right: 8rpx;
 						margin-top: 6rpx;
 					}
-					.info{
+
+					.info {
 						width: 590rpx;
 						line-height: 1.5;
 					}
@@ -673,17 +717,19 @@
 		width: 150rpx;
 		height: 150rpx;
 		position: relative;
-		.icon{
+
+		.icon {
 			width: 30rpx;
 			height: 30rpx;
-			background-color: rgba(0,0,0,0.4);
+			background-color: rgba(0, 0, 0, 0.4);
 			border-radius: 4rpx;
 			position: absolute;
 			bottom: 8rpx;
 			right: 8rpx;
 			text-align: center;
 			line-height: 23rpx;
-			.iconfont{
+
+			.iconfont {
 				color: #fff;
 				font-size: 20rpx;
 			}
@@ -705,16 +751,18 @@
 	.product-window .textpic .text .money {
 		font-size: 24rpx;
 		margin-top: 40rpx;
-		.icon{
+
+		.icon {
 			display: inline-block;
 			font-size: 16rpx;
 			font-weight: normal;
 			background: #FF9500;
-      color: #fff;
+			color: #fff;
 			border-radius: 18rpx;
 			padding: 2rpx 6rpx;
 			margin-left: 10rpx;
-			.iconfont{
+
+			.iconfont {
 				font-size: 16rpx;
 				margin-right: 4rpx;
 				color: #fff;
@@ -775,11 +823,13 @@
 		background: var(--view-minorColorT);
 		border-color: var(--view-theme);
 	}
-	.product-window .productWinList .item .listn .itemn.on2{
+
+	.product-window .productWinList .item .listn .itemn.on2 {
 		background: #bbb;
 		color: #fff;
 		border-color: #bbb;
 	}
+
 	.product-window .productWinList .item .listn .itemn.limit {
 		color: #999;
 		text-decoration: line-through;
@@ -788,8 +838,9 @@
 	.product-window .cart {
 		margin-top: 36rpx;
 		padding: 0 30rpx;
-    
+
 	}
+
 	.product-window .cart .title {
 		font-size: 30rpx;
 		color: #999;
@@ -857,4 +908,4 @@
 		background-color: #bbb;
 		color: #fff;
 	}
-</style>
+</style>

config/app.js

@@ -13,9 +13,9 @@ module.exports = {
 	// 小程序配置
 	// #ifdef MP || APP-PLUS
 	// 请求域名 格式： https://您的域名
-	HTTP_REQUEST_URL: `https://shop.yiqucbb.cn`,
+	HTTP_REQUEST_URL: `https://shop.yiqucguoyuan.com`,
 	// 长连接 格式：wss://您的域名 
-	VUE_APP_WS_URL: `wss://shop.yiqucbb.cn/ws`,
+	VUE_APP_WS_URL: `wss://shop.yiqucguoyuan.com/ws`,
 	// #endif
 	// H5配置
 	// #ifdef H5

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "易趣水果",
-    "appid" : "__UNI__8FE1373",
+    "appid" : "__UNI__EF80BD1",
     "description" : "易趣水果",
     "versionName" : "2.6.0",
     "versionCode" : 267,
@@ -177,7 +177,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx6ca9ac1a01f617a1",
+        "appid" : "wx9d53e46a38eda4b9",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -211,7 +211,7 @@
             "https" : false,
             "proxy" : {
                 "/api" : {
-                    "target" : "https://shop.yiqucbb.cn",
+                    "target" : "https://shop.yiqucguoyuan.com",
                     "changeOrigin" : true
                 }
             }

pages/store_cate/store_cate1.vue

@@ -153,7 +153,7 @@
             </view>
 			<!-- #ifdef H5 || MP -->
 			<view v-if="isSplicingPlatform" :class="{ mask: collageVisible }" @tap="onCollageClose"></view>
-			<view v-if="isSplicingPlatform" :class="{ 'dialog-footer': isFooter, active: collageVisible }" class="dialog">
+			<!-- <view v-if="isSplicingPlatform" :class="{ 'dialog-footer': isFooter, active: collageVisible }" class="dialog">
 				<view class="dialog-head">
 					<view v-for="item in  deliveryList" :key="item.key" :class="{ active: collageDelivery == item.key }" class="button" @tap="collageDeliveryChange(item.key)">
 						<text :class="['iconfont', item.icon]"></text>{{ item.name }}
@@ -193,12 +193,12 @@
 					<button class="button" hover-class="none" @tap="onCollageClose">我再想想</button>
 					<button class="button primary" hover-class="none" @tap="initCollage">发起拼单</button>
 				</view>
-			</view>
-			<addressWindow v-if="isSplicingPlatform" ref="addressWindow" :isFooter='isFooter' :address="address" :pagesUrl="pagesUrl" @changeClose="onAddress" @OnChangeAddress="onAddressChange"></addressWindow>
+			</view> -->
+			<!-- <addressWindow v-if="isSplicingPlatform" ref="addressWindow" :isFooter='isFooter' :address="address" :pagesUrl="pagesUrl" @changeClose="onAddress" @OnChangeAddress="onAddressChange"></addressWindow> -->
 			<!-- #endif -->
             <!-- 分类购物车下拉列表 -->
-            <cartList :cartData="cartData" :isFooter='isFooter' @closeList="closeList" @ChangeCartNumDan="ChangeCartList"
-              @ChangeSubDel="ChangeSubDel" @ChangeOneDel="ChangeOneDel"></cartList>
+            <!-- <cartList :cartData="cartData" :isFooter='isFooter' @closeList="closeList" @ChangeCartNumDan="ChangeCartList"
+              @ChangeSubDel="ChangeSubDel" @ChangeOneDel="ChangeOneDel"></cartList> -->
             <!-- 产品属性组件 -->
             <productWindow :isFooter="isFooter" :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent"
               @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNumDuo" @attrVal="attrVal" @iptCartNum="iptCartNum"

pages/user/index.vue

@@ -393,7 +393,7 @@
             </view>
           </block>
         </view>
-       <!-- <view class="copy_right">
+        <view class="copy_right">
           <template v-if='copyRightText'>
             <image :src="copyRightImg" mode="aspectFill" class="copyRightImg"></image>
             <view class="copyRightText">
@@ -401,7 +401,7 @@
             </view>
           </template>
           <image v-else :src="copyRightImg" mode="aspectFill" class='support'></image>
-        </view> -->
+        </view>
         <view class="uni-p-b-98"></view>
       </scroll-view>
     </view>

pages/users/login/index.vue

@@ -91,7 +91,7 @@
 		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
 			ref="verify"></Verify>
 		<view class="copyright" v-if="copyrightContext">{{copyrightContext}}</view>	
-		<!-- <view class="copyright" v-else>Copyright ©2014-2023 <text class="domain" @click="domainTap('https://www.crmeb.com')">www.crmeb.com</text></view> -->
+		<view class="copyright" v-else>Copyright ©2014-2023 <text class="domain" @click="domainTap('https://www.crmeb.com')">www.crmeb.com</text></view>
 	</view>
 </template>
 <script>