zhengjinyi 4 лет назад
Родитель
Сommit
5a71954a33

+ 2 - 2
common/config/config.js

@@ -1,10 +1,10 @@
 let URL_CONFIG = ""
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // 开发环境
-	URL_CONFIG = 'http://192.168.1.33:8008'	 //俊俊联调地址
+	// URL_CONFIG = 'http://192.168.1.33:8008'	 //俊俊联调地址
 	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.20: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'
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
 }else{
     // 生产环境
     // 生产环境

+ 8 - 0
components/cm-module/activity/activity_on_1.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

Разница между файлами не показана из-за своего большого размера
+ 262 - 2
h5/pages/activity/activity_mid.vue


+ 2 - 1
pages.json

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

+ 10 - 1
pages/tabBar/home/home.vue

@@ -6,7 +6,7 @@
 		<view class="container-home tui-skeleton">
 		<view class="container-home tui-skeleton">
 			<view class="swiper-banner-box" >
 			<view class="swiper-banner-box" >
 				<swiper class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
 				<swiper class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
-					<swiper-item v-for="(item,index) in bannerImageList" :key="index">
+					<swiper-item v-for="(item,index) in bannerImageList" :key="index" @click.stop="handleBannerActivity(item,index)">
 						<image :src="item" class="tui-slide-image" mode="scaleToFill"/>
 						<image :src="item" class="tui-slide-image" mode="scaleToFill"/>
 					</swiper-item>
 					</swiper-item>
 				</swiper>
 				</swiper>
@@ -280,6 +280,15 @@
 					});
 					});
 				});
 				});
 			},
 			},
+			handleBannerActivity(item,index){
+				console.log(item)
+				console.log(index)
+				switch(index){
+					case 0:
+						this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+						break;
+				}
+			},
 			//分类导航跳转
 			//分类导航跳转
 			navToListPage(nav){
 			navToListPage(nav){
 				let self = this;
 				let self = this;

+ 13 - 0
services/activity.service.js

@@ -0,0 +1,13 @@
+/**
+ * 这是活动页相关的业务逻辑的服务
+ */
+export default class ActivityService {
+	constructor(AjaxService) {
+		Object.assign(this, { AjaxService })
+		this.name = 'ActivityService'
+	}
+	/* 小程序支付-活动接口 */
+	GetRepeatActivityBrandList (data = {}) {
+		return this.AjaxService.get({ url:'/repeat/activityBrandList', data, isLoading: true })
+	}
+}

+ 2 - 2
services/ajax.env.js

@@ -1,10 +1,10 @@
 let URL_CONFIG = ""
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // 开发环境
-	URL_CONFIG = 'http://192.168.1.33:8008'	 //俊俊联调地址
+	// URL_CONFIG = 'http://192.168.1.33:8008'	 //俊俊联调地址
 	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.20: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'
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
 }else{
     // 生产环境
     // 生产环境

+ 3 - 0
services/index.js

@@ -6,6 +6,7 @@ import ShopService from './shop.service'
 import PayService from './pay.service'
 import PayService from './pay.service'
 import PhotoService from './photo.service'
 import PhotoService from './photo.service'
 import SellerService from './sellse.service'
 import SellerService from './sellse.service'
+import ActivityService from './activity.service'
 import Vue from 'vue'
 import Vue from 'vue'
 let commonService = new CommonService(ajaxService)
 let commonService = new CommonService(ajaxService)
 let locateService = new LocateService(ajaxService)
 let locateService = new LocateService(ajaxService)
@@ -14,6 +15,7 @@ let shopService = new ShopService(ajaxService)
 let payService = new PayService(ajaxService)
 let payService = new PayService(ajaxService)
 let photoService = new PhotoService(ajaxService)
 let photoService = new PhotoService(ajaxService)
 let sellerService = new SellerService(ajaxService)
 let sellerService = new SellerService(ajaxService)
+let activityService = new ActivityService(ajaxService)
 Vue.prototype.AjaxService = ajaxService
 Vue.prototype.AjaxService = ajaxService
 Vue.prototype.CommonService = commonService
 Vue.prototype.CommonService = commonService
 Vue.prototype.LocateService = locateService
 Vue.prototype.LocateService = locateService
@@ -22,3 +24,4 @@ Vue.prototype.ShopService = shopService
 Vue.prototype.PayService = payService
 Vue.prototype.PayService = payService
 Vue.prototype.PhotoService = photoService
 Vue.prototype.PhotoService = photoService
 Vue.prototype.SellerService = sellerService
 Vue.prototype.SellerService = sellerService
+Vue.prototype.ActivityService = activityService

BIN
static/activity/icon-share@2x.png


BIN
static/activity/icon-tags@2x.png


BIN
static/activity/icon-top@2x.png


BIN
static/activity/icon-zhe@2x.png


Некоторые файлы не были показаны из-за большого количества измененных файлов