运营活动页

common/config/config.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.1.33:8008'	 //俊俊联调地址
-	URL_CONFIG = 'http://192.168.1.40:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.1.40:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.20:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

components/cm-module/activity/activity_on_1.vue

@@ -45,7 +45,7 @@
 			handleClick(e) {
 				console.log(e);
 				if (!this.show) return;
-				this.$emit('click',{});
+				this.$emit('click',false);
 			},
 			handleClickCancel() {
 				this.$emit('cancel',false);
@@ -70,10 +70,11 @@
 		top: 100%;
 		opacity: 0;
 		background: rgba(0,0,0,.5);
-		z-index: 100000;
+		z-index: 99990;
 		image{
-			width: 750rpx;
-			height: 1372rpx;
+			width: 560rpx;
+			height: 784rpx;
+			margin-top: 100rpx;
 		}
 	}
 	.tui-alert-show {
@@ -84,7 +85,7 @@
 	.tui-alert-hide{
 		top: 100%;
 		opacity: 0;
-		animation:rundbottom 0.8s;
+		animation:rundbottom 0.5s;
 	}
 	.icon-iconfontguanbi{
 		display: block;
@@ -94,7 +95,7 @@
 		text-align: center;
 		color: #FFFFFF;
 		position: fixed;
-		bottom: 13%;
+		bottom: 10%;
 		left: 50%;
 		font-size: $font-size-48;
 		font-weight: bold;

pages.json

@@ -444,7 +444,7 @@
 				{
 					"path": "pages/activity/activity_mid",
 					"style": {
-						"navigationBarTitleText": "采美商城年中促销",
+						"navigationBarTitleText": "年中大促",
 						"enablePullDownRefresh":true
 					}
 				}

pages/goods/product.vue

@@ -39,10 +39,9 @@
 							<view v-if="!hasLogin" class="p-login grade  tui-skeleton-fillet">
 								<text class="p-no">价格:</text>
 								<uni-stars :stars="parseInt(product.price1Grade)" :font-size='36' :width-info="180"></uni-stars>
-								<view class="p-minBuy">起订量:<text class="min-text">{{minBuyNumber}}</text></view>
-							</view>
-							<view v-if="!hasLogin" class="p-login tui-skeleton-fillet">
-								<text class="p-login-btn" @click.stop="navToLogin">登录查看价格<text class="iconfont icon-xiayibu" style="font-size: 22rpx;margin: 0 6rpx;"></text></text>
+								<view class="p-login tui-skeleton-fillet">
+									<text class="p-login-btn" @click.stop="navToLogin">登录查看价格<text class="iconfont icon-xiayibu" style="font-size: 22rpx;margin: 0 6rpx;"></text></text>
+								</view>
 							</view>
 							<view class="cm-price" v-else>
 								<cm-price v-if="isRequest"

pages/tabBar/home/home.vue

@@ -293,8 +293,9 @@
 						break;
 				}
 			},
-			handleClick(){
+			handleClick(data){
 				this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+				this.$store.commit('setActivity',data)
 			},
 			handleCancelClick(data){
 				this.$store.commit('setActivity',data)

services/ajax.env.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.1.33:8008'	 //俊俊联调地址
-	URL_CONFIG = 'http://192.168.1.40:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.1.40:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.20:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境