ソースを参照

云上美博会页面修改

喻文俊 3 年 前
コミット
17ad3213dc

+ 185 - 188
components/cm-module/activity/pageFloor.vue

@@ -1,117 +1,117 @@
 <template>
-	<view>
-		<view class="page-content clearfix" v-for="(page, index) in pageFloorList" :key="index">
-			<view class="tui-group-name" v-if="page.floorContent">
-				<view class="tui-group-title">
-					<view class="tui-group-l">{{ page.title }}</view>
-					<view
-						class="tui-group-r"
-						v-if="isSwiperTemp.indexOf(page.floorContent.templateType) === -1"
-						@click="NavToDetailPage(page)"
-					>
-						<text>更多</text> <text class="iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-				<view class="tui-sub__desc">{{ page.detail }}</view>
-			</view>
-			<!-- 图文模板 -->
-			<template v-if="page.floorContent.templateType == '3'">
-				<articleA :pageData="page" :userIdentity="userIdentity"></articleA>
-			</template>
-			<template v-if="page.floorContent.templateType == '4'">
-				<articleB :pageData="page" :userIdentity="userIdentity"></articleB>
-			</template>
-			<template v-if="page.floorContent.templateType == '5'">
-				<articleC :pageData="page" :userIdentity="userIdentity"></articleC>
-			</template>
-			<template v-if="page.floorContent.templateType == '6'">
-				<articleD :pageData="page" :userIdentity="userIdentity"></articleD>
-			</template>
-			<!-- 图片模板 -->
-			<template v-if="page.floorContent.templateType == '1'">
-				<pictureA :pageData="page" :userIdentity="userIdentity"></pictureA>
-			</template>
-			<template v-if="page.floorContent.templateType == '2'">
-				<pictureB :pageData="page" :userIdentity="userIdentity"></pictureB>
-			</template>
-			<template v-if="page.floorContent.templateType == '7'">
-				<pictureC :pageData="page" :userIdentity="userIdentity"></pictureC>
-			</template>
-			<template v-if="page.floorContent.templateType == '8'">
-				<pictureD :pageData="page" :userIdentity="userIdentity"></pictureD>
-			</template>
-			<template v-if="page.floorContent.templateType == '9'">
-				<pictureE :pageData="page" :userIdentity="userIdentity"></pictureE>
-			</template>
-			<template v-if="page.floorContent.templateType == '10'">
-				<pictureF :pageData="page" :userIdentity="userIdentity"></pictureF>
-			</template>
-			<!-- 产品模板 -->
-			<template v-if="page.floorContent.templateType == '11'">
-				<productI :pageData="page" :userIdentity="userIdentity"></productI>
-			</template>
-			<template v-if="page.floorContent.templateType == '12'">
-				<productJ :pageData="page" :userIdentity="userIdentity"></productJ>
-			</template>
-			<template v-if="page.floorContent.templateType == '13'">
-				<productK :pageData="page" :userIdentity="userIdentity"></productK>
-			</template>
-			<template v-if="page.floorContent.templateType == '14'">
-				<productG :pageData="page" :userIdentity="userIdentity"></productG>
-			</template>
-			<template v-if="page.floorContent.templateType == '15'">
-				<productD :pageData="page" :userIdentity="userIdentity"></productD>
-			</template>
-			<template v-if="page.floorContent.templateType == '16'">
-				<productC :pageData="page" :userIdentity="userIdentity"></productC>
-			</template>
-			<template v-if="page.floorContent.templateType == '17'">
-				<productB :pageData="page" :userIdentity="userIdentity"></productB>
-			</template>
-			<template v-if="page.floorContent.templateType == '18'">
-				<productA :pageData="page" :userIdentity="userIdentity"></productA>
-			</template>
-			<template v-if="page.floorContent.templateType == '19'">
-				<productE :pageData="page" :userIdentity="userIdentity"></productE>
-			</template>
-			<template v-if="page.floorContent.templateType == '20'">
-				<productF :pageData="page" :userIdentity="userIdentity"></productF>
-			</template>
-			<template v-if="page.floorContent.templateType == '21'">
-				<productH :pageData="page" :userIdentity="userIdentity"></productH>
-			</template>
+    <view>
+        <view class="page-content clearfix" v-for="(page, index) in pageFloorList" :key="index">
+            <view class="tui-group-name" v-if="page.floorContent">
+                <view class="tui-group-title">
+                    <view class="tui-group-l">{{ page.title }}</view>
+                    <view
+                        class="tui-group-r"
+                        v-if="isSwiperTemp.indexOf(page.floorContent.templateType) === -1"
+                        @click="NavToDetailPage(page)"
+                    >
+                        <text>更多</text> <text class="iconfont icon-xiayibu"></text>
+                    </view>
+                </view>
+                <view class="tui-sub__desc">{{ page.detail }}</view>
+            </view>
+            <!-- 图文模板 -->
+            <template v-if="page.floorContent.templateType == '3'">
+                <articleA :pageData="page" :userIdentity="userIdentity"></articleA>
+            </template>
+            <template v-if="page.floorContent.templateType == '4'">
+                <articleB :pageData="page" :userIdentity="userIdentity"></articleB>
+            </template>
+            <template v-if="page.floorContent.templateType == '5'">
+                <articleC :pageData="page" :userIdentity="userIdentity"></articleC>
+            </template>
+            <template v-if="page.floorContent.templateType == '6'">
+                <articleD :pageData="page" :userIdentity="userIdentity"></articleD>
+            </template>
+            <!-- 图片模板 -->
+            <template v-if="page.floorContent.templateType == '1'">
+                <pictureA :pageData="page" :userIdentity="userIdentity"></pictureA>
+            </template>
+            <template v-if="page.floorContent.templateType == '2'">
+                <pictureB :pageData="page" :userIdentity="userIdentity"></pictureB>
+            </template>
+            <template v-if="page.floorContent.templateType == '7'">
+                <pictureC :pageData="page" :userIdentity="userIdentity"></pictureC>
+            </template>
+            <template v-if="page.floorContent.templateType == '8'">
+                <pictureD :pageData="page" :userIdentity="userIdentity"></pictureD>
+            </template>
+            <template v-if="page.floorContent.templateType == '9'">
+                <pictureE :pageData="page" :userIdentity="userIdentity"></pictureE>
+            </template>
+            <template v-if="page.floorContent.templateType == '10'">
+                <pictureF :pageData="page" :userIdentity="userIdentity"></pictureF>
+            </template>
+            <!-- 产品模板 -->
+            <template v-if="page.floorContent.templateType == '11'">
+                <productI :pageData="page" :userIdentity="userIdentity"></productI>
+            </template>
+            <template v-if="page.floorContent.templateType == '12'">
+                <productJ :pageData="page" :userIdentity="userIdentity"></productJ>
+            </template>
+            <template v-if="page.floorContent.templateType == '13'">
+                <productK :pageData="page" :userIdentity="userIdentity"></productK>
+            </template>
+            <template v-if="page.floorContent.templateType == '14'">
+                <productG :pageData="page" :userIdentity="userIdentity"></productG>
+            </template>
+            <template v-if="page.floorContent.templateType == '15'">
+                <productD :pageData="page" :userIdentity="userIdentity"></productD>
+            </template>
+            <template v-if="page.floorContent.templateType == '16'">
+                <productC :pageData="page" :userIdentity="userIdentity"></productC>
+            </template>
+            <template v-if="page.floorContent.templateType == '17'">
+                <productB :pageData="page" :userIdentity="userIdentity"></productB>
+            </template>
+            <template v-if="page.floorContent.templateType == '18'">
+                <productA :pageData="page" :userIdentity="userIdentity"></productA>
+            </template>
+            <template v-if="page.floorContent.templateType == '19'">
+                <productE :pageData="page" :userIdentity="userIdentity"></productE>
+            </template>
+            <template v-if="page.floorContent.templateType == '20'">
+                <productF :pageData="page" :userIdentity="userIdentity"></productF>
+            </template>
+            <template v-if="page.floorContent.templateType == '21'">
+                <productH :pageData="page" :userIdentity="userIdentity"></productH>
+            </template>
             <!-- 直播模板 -->
             <template v-if="page.floorContent.templateType == '22'">
-            	<liveA :pageData="page" :userIdentity="userIdentity"></liveA>
+                <liveA :pageData="page" :userIdentity="userIdentity"></liveA>
             </template>
             <template v-if="page.floorContent.templateType == '23'">
-            	<liveC :pageData="page" :userIdentity="userIdentity"></liveC>
+                <liveC :pageData="page" :userIdentity="userIdentity"></liveC>
             </template>
             <template v-if="page.floorContent.templateType == '24'">
-            	<liveA :pageData="page" :userIdentity="userIdentity"></liveA>
+                <liveA :pageData="page" :userIdentity="userIdentity"></liveA>
             </template>
             <template v-if="page.floorContent.templateType == '25'">
-            	<liveB :pageData="page" :userIdentity="userIdentity"></liveB>
+                <liveB :pageData="page" :userIdentity="userIdentity"></liveB>
             </template>
             <!-- 视频模板 -->
             <template v-if="page.floorContent.templateType == '26'">
-            	<pictureH :pageData="page" :userIdentity="userIdentity"></pictureH>
+                <pictureH :pageData="page" :userIdentity="userIdentity"></pictureH>
             </template>
             <template v-if="page.floorContent.templateType == '27'">
-            	<pictureC :pageData="page" :userIdentity="userIdentity"></pictureC>
+                <pictureC :pageData="page" :userIdentity="userIdentity"></pictureC>
             </template>
             <template v-if="page.floorContent.templateType == '28'">
-            	<pictureG :pageData="page" :userIdentity="userIdentity"></pictureG>
+                <pictureG :pageData="page" :userIdentity="userIdentity"></pictureG>
             </template>
             <template v-if="page.floorContent.templateType == '29'">
-            	<pictureD :pageData="page" :userIdentity="userIdentity"></pictureD>
+                <pictureD :pageData="page" :userIdentity="userIdentity"></pictureD>
             </template>
-		</view>
-	</view>
+        </view>
+    </view>
 </template>
 
 <script>
-//引入产品模板	
+//引入产品模板
 import productA from '@/components/cm-module/pageTemplate/templateA.vue'
 import productB from '@/components/cm-module/pageTemplate/templateB.vue'
 import productC from '@/components/cm-module/pageTemplate/templateC.vue'
@@ -138,118 +138,115 @@ import articleB from '@/components/cm-module/articleTemplate/templateB.vue'
 import articleC from '@/components/cm-module/articleTemplate/templateC.vue'
 import articleD from '@/components/cm-module/articleTemplate/templateD.vue'
 // 直播楼层模板
-import liveA from '@/components/cm-module/liveTemplate/templateA.vue' 
-import liveB from '@/components/cm-module/liveTemplate/templateB.vue' 
-import liveC from '@/components/cm-module/liveTemplate/templateC.vue' 
+import liveA from '@/components/cm-module/liveTemplate/templateA.vue'
+import liveB from '@/components/cm-module/liveTemplate/templateB.vue'
+import liveC from '@/components/cm-module/liveTemplate/templateC.vue'
 
 export default {
-	name: 'pageFloor',
-	components: {
-		productA,
-		productB,
-		productC,
-		productD,
-		productE,
-		productF,
-		productG,
-		productH,
-		productI,
-		productJ,
-		productK,
-		pictureA,
-		pictureB,
-		pictureC,
-		pictureD,
-		pictureE,
-		pictureF,
+    name: 'pageFloor',
+    components: {
+        productA,
+        productB,
+        productC,
+        productD,
+        productE,
+        productF,
+        productG,
+        productH,
+        productI,
+        productJ,
+        productK,
+        pictureA,
+        pictureB,
+        pictureC,
+        pictureD,
+        pictureE,
+        pictureF,
         pictureG,
         pictureH,
-		articleA,
-		articleB,
-		articleC,
-		articleD,
+        articleA,
+        articleB,
+        articleC,
+        articleD,
         liveA,
-        liveC, 
+        liveC,
         liveB
-	},
-	props: {
-		list: {
-			type: Array
-		},
-		pageType: {
-			type: Number
-		},
-		userIdentity: {
-			type: Number
-		}
-	},
-	data() {
-		return {
-			pageFloorList: [],
-			isSwiperTemp:['1','2','9','21','5','7','22','23','24','25','27']
-		}
-	},
-	created() {
-		this.initData(this.list)
-	},
-	computed: {},
-	methods: {
-		initData(data) {
-			this.pageFloorList = data
-		},
-		NavToDetailPage(page) {
-			//跳转
-			this.$api.navigateTo(
-				`/pages/h5/activity/activity-floorMore?pageType=${this.pageType}&floorId=${page.id}&title=${
-					page.title
-				}`
-			)
-		}
-	}
+    },
+    props: {
+        list: {
+            type: Array
+        },
+        pageType: {
+            type: Number
+        },
+        userIdentity: {
+            type: Number
+        }
+    },
+    data() {
+        return {
+            pageFloorList: [],
+            isSwiperTemp: ['1', '2', '9', '21', '5', '7', '22', '23', '24', '25', '27', '8']
+        }
+    },
+    created() {
+        this.initData(this.list)
+    },
+    methods: {
+        initData(data) {
+            this.pageFloorList = data
+        },
+        NavToDetailPage(page) {
+            //跳转
+            this.$api.navigateTo(
+                `/pages/h5/activity/activity-floorMore?pageType=${this.pageType}&floorId=${page.id}&title=${page.title}`
+            )
+        }
+    }
 }
 </script>
 
 <style lang="scss">
 .page-content {
-	background-color: #f7f7f7;
-	width: 100%;
-	height: auto;
-	box-sizing: border-box;
-	padding: 0 24rpx;
-	float: left;
+    background-color: #f7f7f7;
+    width: 100%;
+    height: auto;
+    box-sizing: border-box;
+    padding: 0 24rpx;
+    float: left;
 }
 .tui-group-name {
-	width: 100%;
-	height: 92rpx;
-	padding: 20rpx 0;
+    width: 100%;
+    height: 92rpx;
+    padding: 20rpx 0;
 }
 .tui-group-title {
-	width: 100%;
-	float: left;
-	.tui-group-l {
-		float: left;
-		font-size: 34rpx;
-		font-weight: bold;
-		text-align: left;
-		line-height: 49rpx;
-		color: #333;
-	}
-	.tui-group-r {
-		float: right;
-		font-size: $font-size-26;
-		text-align: right;
-		line-height: 49rpx;
-		color: #999999;
-		.icon-xiayibu {
-			font-size: $font-size-30;
-			color: #999999;
-		}
-	}
+    width: 100%;
+    float: left;
+    .tui-group-l {
+        float: left;
+        font-size: 34rpx;
+        font-weight: bold;
+        text-align: left;
+        line-height: 49rpx;
+        color: #333;
+    }
+    .tui-group-r {
+        float: right;
+        font-size: $font-size-26;
+        text-align: right;
+        line-height: 49rpx;
+        color: #999999;
+        .icon-xiayibu {
+            font-size: $font-size-30;
+            color: #999999;
+        }
+    }
 }
 .tui-sub__desc {
-	width: 100%;
-	float: left;
-	color: rgba(153, 153, 153, 0.9);
-	font-size: $font-size-26;
+    width: 100%;
+    float: left;
+    color: rgba(153, 153, 153, 0.9);
+    font-size: $font-size-26;
 }
 </style>

+ 76 - 20
components/cm-module/activityContact/index.vue

@@ -11,9 +11,9 @@
             <view class="cm-icon cm-bround cm-mobile" @click="handelShowMobile">
                 <view class="cm-dialog" v-show="mobileVisiable">
                     <view class="cm-dialog-content content1">
-                        <view class="cm-item"> <text>展会咨询电话:15338851365</text> </view>
+                        <view class="cm-item"> <text>展会咨询电话:15338897365</text> </view>
                         <view class="cm-line line1"></view>
-                        <view class="cm-item"> <text>业务咨询电话:15338897365</text> </view>
+                        <view class="cm-item"> <text>客服咨询电话:15338851365</text> </view>
                     </view>
                 </view>
             </view>
@@ -22,7 +22,7 @@
                     <view class="cm-dialog-content content2">
                         <view class="cm-item">
                             <image
-                                src="https://static.caimei365.com/app/img/icon2/cm_wechat_01.png"
+                                src="https://static.caimei365.com/app/img/icon2/cm_wechat_02.png"
                                 mode="widthFix"
                             ></image>
                             <text>展会咨询微信</text>
@@ -30,10 +30,10 @@
                         <view class="cm-line line2"></view>
                         <view class="cm-item">
                             <image
-                                src="https://static.caimei365.com/app/img/icon2/cm_wechat_02.png"
+                                src="https://static.caimei365.com/app/img/icon2/cm_wechat_01.png"
                                 mode="widthFix"
                             ></image>
-                            <text>业务咨询微信</text>
+                            <text>客服咨询微信</text>
                         </view>
                     </view>
                 </view>
@@ -42,10 +42,20 @@
         </view>
         <view class="mask cover" v-if="activityEntryVisiable && entryVisiable">
             <view class="content">
-                <image src="https://static.caimei365.com/app/img/icon2/cm_entry_bg.png" mode="widthFix" @click="navigator"></image>
+                <image src="https://static.caimei365.com/app/img/icon2/cm_entry_bg.png" mode="widthFix" @click="handleToggleCoupon(true)"></image>
                 <view class="mask-close" @click="handleToggleEntry(false)"></view>
             </view>
         </view>
+        
+        <view class="mask cover" v-if="showCouponEntry">
+            <view class="content">
+                <view class="btn btn1" @click="navigatorToPro(1)"></view>
+                <view class="btn btn2" @click="navigatorToPro(2)"></view>
+                <image src="https://static.caimei365.com/app/img/icon2/coupon-entry-app.png" mode="widthFix"></image>
+                <view class="mask-close" @click="handleToggleCoupon(false)"></view>
+            </view>
+        </view>
+        
         <view class="mask" v-if="mobileVisiable || wechatVisiable" @click="handleClose"></view>
     </view>
 </template>
@@ -64,7 +74,8 @@ export default {
             wechatVisiable: false,
             entryVisiable: true,
             activityEntryVisiable: false,
-            contactVisiable: false
+            contactVisiable: false,
+            showCouponEntry: false,
         }
     },
     created() {
@@ -101,23 +112,52 @@ export default {
         handleToggleEntry(visiable) {
             this.entryVisiable = visiable
         },
-		navigator(){
+		navigatorToPro(flag){
             // 友盟自定义事件
             if(process.env.NODE_ENV != 'development'){
-            	this.$uma.trackEvent('meibohui_cloud_click', {
-            		Um_Key_PageName: '云上美博会',
-            		Um_Key_PageCategory: '活动专题页面',
-            		Um_Key_SourcePage: '活动专题页面',
-            	})
+                if(flag === 2 ){
+                    this.$uma.trackEvent('meibohui_cloud_click', {
+                    	Um_Key_PageName: '云上美博会优惠券介绍',
+                    	Um_Key_PageCategory: '活动专题页面',
+                    	Um_Key_SourcePage: '活动专题页面',
+                    })
+                }
+                
+                if(flag === 1){
+                    this.$uma.trackEvent('meibohui_cloud_click', {
+                    	Um_Key_PageName: '云上美博会优惠券购买跳转',
+                    	Um_Key_PageCategory: '活动专题页面',
+                    	Um_Key_SourcePage: '活动专题页面',
+                    })
+                }
             }
-			this.$api.navigateTo('/pages/user/coupon/coupon-collection')
+            
+            if(flag === 2) this.$api.navigateTo('/pages/h5/activity/couponExp')
+			else this.$api.navigateTo('/pages/goods/product?id=6898')
             this.entryVisiable = false
+            this.showCouponEntry = false
 		},
+        // 优惠券入口
+        handleToggleCoupon(flag){
+            // 友盟自定义事件
+            if(false && process.env.NODE_ENV != 'development'){
+                this.$uma.trackEvent('meibohui_cloud_click', {
+                	Um_Key_PageName: '云上美博会获取弹窗点击',
+                	Um_Key_PageCategory: '活动专题页面',
+                	Um_Key_SourcePage: '活动专题页面',
+                })
+            }
+            this.showCouponEntry = flag
+            this.entryVisiable = false
+        }, 
         // 初始化红包入口状态
         initActivityEntry(begin, end) {
             const nowTime = new Date().getTime()
-            const beginTime = new Date(begin).getTime()
-            const endTime = new Date(end).getTime()
+            // 兼容 iso android 的时间处理
+            const beginTime = new Date(begin.replace(/-/g, '/')).getTime()
+            const endTime = new Date(end.replace(/-/g, '/')).getTime()
+            console.log('活动是否开始: ')
+            console.log(nowTime >= beginTime && nowTime <= endTime)
             return nowTime >= beginTime && nowTime <= endTime
         }
     }
@@ -128,7 +168,8 @@ export default {
 .cm-contact {
     position: fixed;
     right: 20rpx;
-    bottom: 17%;
+    bottom: 20%;
+    z-index: 9999;
 }
 .cm-close-box {
     position: relative;
@@ -233,7 +274,7 @@ export default {
     justify-content: center;
     align-items: center;
     position: fixed;
-    z-index: 1;
+    z-index: 999;
     top: 0;
     left: 0;
     width: 100vw;
@@ -243,19 +284,34 @@ export default {
         .mask-close {
             z-index: 9;
             position: absolute;
-            top: -40rpx;
+            top: -80rpx;
             right: 40rpx;
             width: 64rpx;
             height: 64rpx;
             background: url(https://static.caimei365.com/app/img/icon2/cm_float_close.png) no-repeat center;
             background-size: 60rpx 60rpx;
         }
+        .btn{
+            width: 80rpx;
+            height: 80rpx;
+            background: #666;
+            z-index: 9999;
+            position: absolute;
+            right: 60rpx;
+            opacity: 0;
+            &.btn1{
+                top: 175rpx;
+            }
+            &.btn2{
+                top: 350rpx;
+            }
+        }
         image {
             width: 560rpx;
         }
     }
     &.cover {
-        z-index: 999;
+        z-index: 999999;
         background: rgba(0, 0, 0, 0.4);
     }
 }

+ 6 - 10
components/cm-module/articleTemplate/templateA.vue

@@ -6,7 +6,7 @@
 			:key="index"
 			@click="navigaitionTo(item)"
 		>
-			<image :src="item.appletsImage" mode="aspectFit" class="cover"></image>
+			<image :src="item.appletsImage" class="cover"></image>
 			<view class="article-text">
 				<view class="title">{{ item.name }}</view>
 				<view class="content" v-text="item.content"></view>
@@ -47,15 +47,11 @@ export default {
 			}
 		},
 		navigaitionTo(item) {
-			if (item.adsImage === '' && item.linkType === -1) {
-				return
-			}else if(item.linkType === -1){
-				uni.navigateTo({
-					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
-				})
-			}else{
-				caimeiApi.FlooryNavigateTo(item)
-			}
+            if(item.link){
+                uni.navigateTo({
+                    url: `/pages/h5/article/path?link=${item.link}`
+                })
+            }
 		}
 	}
 }

+ 7 - 11
components/cm-module/articleTemplate/templateB.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container article-list">
 		<view class="section clearfix" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
-			<image :src="item.appletsImage" mode="aspectFit" class="cover"></image>
+			<image :src="item.appletsImage" class="cover"></image>
 			<view class="article-text">
 				<view class="title">{{item.name}}</view>
 				<view class="content" v-text="item.content"></view>
@@ -31,25 +31,21 @@ export default {
 		}
 	},
 	created() {
-		this.initData(this.pageData);
+		this.initData(this.pageData)
 	},
 	methods:{
 		initData(data){
 			if(this.flag){
 				this.productList = data.floorImageList
 			}else{
-				this.productList = data.floorImageList.slice(0,2);
+				this.productList = data.floorImageList.slice(0,2)
 			}
 		},
 		navigaitionTo(item){
-			if (item.adsImage === '' && item.linkType === -1) {
-				return
-			}else if(item.linkType === -1){
-				uni.navigateTo({
-					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
-				})
-			}else{
-				caimeiApi.FlooryNavigateTo(item)
+			if(item.link){
+			    uni.navigateTo({
+			        url: `/pages/h5/article/path?link=${item.link}`
+			    })
 			}
 		}
 	}

+ 7 - 11
components/cm-module/articleTemplate/templateC.vue

@@ -2,7 +2,7 @@
 	<scroll-view scroll-x="true" class="container article-list">
 		<view class="section" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
 			<view class="cover">
-				<image :src="item.appletsImage" mode="widthFix" class="cover-gg"></image>
+				<image :src="item.appletsImage" class="cover-gg"></image>
 			</view>
 			<view class="article-text">
 				<view class="title">{{item.name}}</view>
@@ -29,21 +29,17 @@ export default {
 		}
 	},
 	created() {
-		this.initData(this.pageData);
+		this.initData(this.pageData)
 	},
 	methods:{
 		initData(data){
-			this.productList = data.floorImageList;
+			this.productList = data.floorImageList
 		},
 		navigaitionTo(item){
-			if (item.adsImage === '' && item.linkType === -1) {
-				return
-			}else if(item.linkType === -1){
-				uni.navigateTo({
-					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
-				})
-			}else{
-				caimeiApi.FlooryNavigateTo(item)
+			if(item.link){
+			    uni.navigateTo({
+			        url: `/pages/h5/article/path?link=${item.link}`
+			    })
 			}
 		}
 	}

+ 7 - 11
components/cm-module/articleTemplate/templateD.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container article-list clearfix">
 		<view class="section" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
-			<image :src="item.appletsImage" mode="aspectFit" class="cover"></image>
+			<image :src="item.appletsImage" class="cover"></image>
 			<view class="article-text">
 				<view class="title">{{item.name}}</view>
 				<view class="content" v-text="item.content"></view>
@@ -31,25 +31,21 @@ export default {
 		}
 	},
 	created() {
-		this.initData(this.pageData);
+		this.initData(this.pageData)
 	},
 	methods:{
 		initData(data){
 			if(this.flag){
 				this.productList = data.floorImageList
 			}else{
-				this.productList = data.floorImageList.slice(0,4);
+				this.productList = data.floorImageList.slice(0,4)
 			}
 		},
 		navigaitionTo(item){
-			if (item.adsImage === '' && item.linkType === -1) {
-				return
-			}else if(item.linkType === -1){
-				uni.navigateTo({
-					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
-				})
-			}else{
-				caimeiApi.FlooryNavigateTo(item)
+			if(item.link){
+			    uni.navigateTo({
+			        url: `/pages/h5/article/path?link=${item.link}`
+			    })
 			}
 		}
 	}

+ 926 - 932
pages.json

@@ -1,935 +1,929 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/tabBar/home/index",
-			"style": {
-				"navigationBarTitleText": "采美采购商城",
-				"enablePullDownRefresh":true,
-				"backgroundColor":"#F28F31",
-				"backgroundTextStyle":"light",
-				"navigationStyle":"custom"
-			}
-		},{
-			"path": "pages/authorization/authorization",
-			"style": {
-				"navigationBarTitleText": "微信授权",
-				"navigationStyle":"custom"
-			}
-		},{
-		    "path" : "pages/tabBar/category/index",
-		    "style" : {
-				"navigationBarTitleText": "分类",
-				"navigationStyle":"custom"
-			}
-		},{
-			"path": "pages/tabBar/cart/index",
-			"style": {
-				"navigationBarTitleText": "购物车",
-				"enablePullDownRefresh":true
-			}
-		},{
-			"path": "pages/tabBar/user/user",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"enablePullDownRefresh" : true,
-				"navigationStyle":"custom"
-			}
-		}
+    "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+        {
+            "path": "pages/tabBar/home/index",
+            "style": {
+                "navigationBarTitleText": "采美采购商城",
+                "enablePullDownRefresh": true,
+                "backgroundColor": "#F28F31",
+                "backgroundTextStyle": "light",
+                "navigationStyle": "custom"
+            }
+        }, {
+            "path": "pages/authorization/authorization",
+            "style": {
+                "navigationBarTitleText": "微信授权",
+                "navigationStyle": "custom"
+            }
+        }, {
+            "path": "pages/tabBar/category/index",
+            "style": {
+                "navigationBarTitleText": "分类",
+                "navigationStyle": "custom"
+            }
+        }, {
+            "path": "pages/tabBar/cart/index",
+            "style": {
+                "navigationBarTitleText": "购物车",
+                "enablePullDownRefresh": true
+            }
+        }, {
+            "path": "pages/tabBar/user/user",
+            "style": {
+                "navigationBarTitleText": "我的",
+                "enablePullDownRefresh": true,
+                "navigationStyle": "custom"
+            }
+        }
     ],
-	"subPackages": [
-		{
-			"root": "pages/service/",//信息服务模块
-			"pages": [
-				{
-					"path": "aftersale",
-					"style": {
-						"navigationBarTitleText": "售后无忧"
-					}
-				},
-				{
-					"path": "service",
-					"style": {
-						"navigationBarTitleText": "采美365网"
-					}
-				},
-				{
-					"path": "shoppingnotice",
-					"style": {
-						"navigationBarTitleText": "购物须知"
-					}
-				},
-				{
-					"path": "sellconten",
-					"style": {
-						"navigationBarTitleText": "条款内容"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/goods/",//商品模块
-			"pages": [
-				/*美体节临时页面*/
-				{
-					"path": "good-floor-temp",
-					"style": {
-						"navigationBarTitleText": "美体节",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "goods-instrument",
-					"style": {
-						"navigationBarTitleText": "项目仪器",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "goods-classify",
-					"style": {
-						"navigationBarTitleText": "商品列表",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "good-floorMore",
-					"style": {
-						"navigationBarTitleText": "更多楼层",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "good-floor",
-					"style": {
-						"navigationBarTitleText": "",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "goods-active",
-					"style": {
-						"navigationBarTitleText": "凑单商品",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "product",
-					"style": {
-						"navigationBarTitleText": "商品详情",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "instrument-details",
-					"style": {
-						"navigationBarTitleText": "项目仪器详情",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "cart",
-					"style": {
-						"navigationBarTitleText": "购物车",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "cart-index",
-					"style": {
-						"navigationBarTitleText": "购物车",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/login/",//注册登录模块
-			"pages": [
-				{
-					"path": "register",
-					"style": {
-						"navigationBarTitleText": "机构注册",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "register-supplier",
-					"style": {
-						"navigationBarTitleText": "供应商注册",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "register-select",
-					"style": {
-						"navigationBarTitleText": "选择身份"
-					}
-				},
-				{
-					"path": "apply",
-					"style": {
-						"navigationBarTitleText": "升级会员机构",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "apply-supplier",
-					"style": {
-						"navigationBarTitleText": "修改申请资料",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "logincode",
-					"style": {
-						"navigationBarTitleText": "邀请码登录"
-					}
-				},
-				{
-					"path": "login",
-					"style": {
-						"navigationBarTitleText": "登录"
-					}
-				},
-				{
-					"path": "binding",
-					"style": {
-						"navigationBarTitleText": "注册信息"
-					}
-				},
-				{
-					"path": "bindwechat",
-					"style": {
-						"navigationBarTitleText": "绑定微信"
-					}
-				},
-				{
-					"path": "bindOperator",
-					"style": {
-						"navigationBarTitleText": "绑定运营人员"
-					}
-				},
-				{
-					"path": "information",
-					"style": {
-						"navigationBarTitleText": "修改资料",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "password",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/user/",//机构个人中心模块
-			"pages": [
-				{
-					"path": "account/account",
-					"style": {
-						"navigationBarTitleText": "账户余额明细",
-						"enablePullDownRefresh" : true,
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "account/account-bean",
-					"style": {
-						"navigationBarTitleText": "采美豆明细",
-						"enablePullDownRefresh" : true,
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "address/addressManage",
-					"style": {
-						"navigationBarTitleText": "添加新地址"
-					}
-				},
-				{
-					"path": "address/address",
-					"style": {
-						"navigationBarTitleText": "地址列表"
-					}
-				},
-				{
-					"path": "about/about",
-					"style": {
-						"navigationBarTitleText": "关于我们"
-					}
-				},
-				{
-				    "path" : "regularPurchase/regularPurchase",
-				    "style" : {
-						"navigationBarTitleText": "再次购买"
-					}
-				},
-				{
-					"path": "order/create-order",
-					"style": {
-						"navigationBarTitleText": "确认订单"			
-					}
-				},
-				{
-					"path": "order/success",
-					"style": {
-						"navigationBarTitleText": "支付结果",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "order/order-payment",
-					"style": {
-						"navigationBarTitleText": "选择支付方式",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "order/order-pay",
-					"style": {
-						"navigationBarTitleText": "收银台",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "order/orderShareLogin",
-					"style": {
-						"navigationBarTitleText": "输入分享码"
-					}
-				},
-				{
-					"path": "order/order-sharelogin",
-					"style": {
-						"navigationBarTitleText": "查看订单"
-					}
-				},
-				{
-					"path": "order/order-list",
-					"style": {
-						"navigationBarTitleText": "我的订单",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "order/order-details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "order/order-sharedetails",
-					"style": {
-						"navigationBarTitleText": "订单详情"
-					}
-				},
-				{
-					"path": "order/order-logistics",
-					"style": {
-						"navigationBarTitleText": "物流信息"
-					}
-				},
-				{
-					"path": "operator/list",
-					"style": {
-						"navigationBarTitleText": "运营人员管理"
-					}
-				},
-				{
-					"path": "operator/addoperator",
-					"style": {
-						"navigationBarTitleText": "添加运营人员"
-					}
-				},
-				{
-					"path": "setting/setting",
-					"style": {
-						"navigationBarTitleText": "账户设置"
-					}
-				},
-				{
-					"path": "setting/phone",
-					"style": {
-						"navigationBarTitleText": "更换手机号"
-					}
-				},
-				{
-					"path": "coupon/coupon",
-					"style": {
-						"navigationBarTitleText": "优惠券",
-						"enablePullDownRefresh" : true
-					}
-				},
-				{
-					"path": "coupon/coupon-collection",
-					"style": {
-						"navigationBarTitleText": "领券中心",
-						"enablePullDownRefresh" : true
-					}
-				},
-				{
-					"path": "coupon/coupon-exchange", 
-					"style": {
-						"navigationBarTitleText": "兑换优惠券"
-					}
-				},
-				{
-					"path": "coupon/coupon-product",
-					"style": {
-						"navigationBarTitleText": "活动商品",
-						"enablePullDownRefresh" : true
-					}
-				}
-			]	
-		},
-		{
-			"root": "pages/seller/",
-			"pages": [
-				{
-					"path": "index/index",
-					"style": {
-						"navigationBarTitleText": "采美采购商城",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "login/login",
-					"style": {
-						"navigationBarTitleText": "登录",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "cart/cart",
-					"style": {
-						"navigationBarTitleText": "购物车"
-					}
-				},
-				{
-					"path": "cart/buyagain",
-					"style": {
-						"navigationBarTitleText": "再次购买"
-					}
-				},
-				{
-					"path": "cart/immediately",
-					"style": {
-						"navigationBarTitleText": "立即下单"
-					}
-				},{
-					"path": "cart/second",
-					"style": {
-						"navigationBarTitleText": "二手下单"
-					}
-				},
-				{
-					"path": "order/create-order",
-					"style": {
-						"navigationBarTitleText": "确认订单"
-					}
-				},
-				{
-					"path": "order/create-recharge-order",
-					"style": {
-						"navigationBarTitleText": "确认订单"
-					}
-				},
-				{
-					"path": "order/order-details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "order/order-list",
-					"style": {
-						"navigationBarTitleText": "订单列表",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "order/order-sharedetails",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "club/list",
-					"style": {
-						"navigationBarTitleText": "机构列表"
-					}
-				},
-				{
-					"path": "club/stayClub-list",
-					"style": {
-						"navigationBarTitleText": "待注册机构"
-					}
-				},
-				{
-					"path": "club/club-list",
-					"style": {
-						"navigationBarTitleText": "我的机构"
-					}
-				},
-				{
-					"path": "club/allClub-list",
-					"style": {
-						"navigationBarTitleText": "所有机构"
-					}
-				},
-				{
-					"path": "club/addoperator",
-					"style": {
-						"navigationBarTitleText": "邀请运营人员"
-					}
-				},
-				{
-					"path": "login/register",
-					"style": {
-						"navigationBarTitleText": "拉机构上线",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "login/register-select",
-					"style": {
-						"navigationBarTitleText": "拉机构上线"
-					}
-				},
-				{
-					"path": "login/register-general",
-					"style": {
-						"navigationBarTitleText": "普通机构"
-					}
-				},
-				{
-					"path": "login/register-member",
-					"style": {
-						"navigationBarTitleText": "会员机构"
-					}
-				},
-				{
-					"path": "login/information",
-					"style": {
-						"navigationBarTitleText": "修改资料",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "login/apply",
-					"style": {
-						"navigationBarTitleText": "修改申请信息",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "order/order-historylist",
-					"style": {
-						"navigationBarTitleText": "订单列表"
-					}
-				},{
-					"path": "search/search-order",
-					"style": {
-						"navigationBarTitleText": "订单搜索"
-					}
-				},
-				{
-					"path": "address/address",
-					"style": {
-						"navigationBarTitleText": "选择地址"
-					}
-				},
-				{
-					"path": "address/addressManage",
-					"style": {
-						"navigationBarTitleText": "添加地址"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/h5/",//活动分包模块
-			"pages": [
-				{
-					"path": "activity/activity",
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				},
-				{
-					"path": "activity/activity_mid",
-					"style": {
-						"navigationBarTitleText": "年中大促",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "activity/meobohui",
-					"style": {
-						"navigationBarTitleText": "美博会",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "activity/activity-topic",
-					"style": {
-						"navigationBarTitleText": "活动专题",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "activity/activity-detail",
-					"style": {
-						"navigationBarTitleText": "活动专题",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "activity/activity-floorMore",
-					"style": {
-						"navigationBarTitleText": "更多",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "activity/meobohui-booth",
-					"style": {
-						"navigationBarTitleText": "展位图",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "activity/meobohui-supplier",
-					"style": {
-						"navigationBarTitleText": "参展商",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "article/page",
-					"style": {
-						"navigationBarTitleText": "采美采购平台",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "article/path",
-					"style": {
-						"navigationBarTitleText": "采美采购平台",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "article/page-image",
-					"style": {
-						"navigationBarTitleText": "采美采购平台"
-					}
-				},
-				{
-					"path": "article/path-live",
-					"style": {
-						"navigationBarTitleText": "采美采购平台",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "activity/activity-list",
-					"style": {
-						"navigationBarTitleText": "商品专题",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "other/repair",
-					"style": {
-						"navigationBarTitleText": "维修"
-					}
-				},
-				{
-					"path": "other/brand",
-					"style": {
-						"navigationBarTitleText": "品牌招商"
-					}
-				},
-				{
-					"path": "other/brands",
-					"style": {
-						"navigationBarTitleText": "品牌招商"
-					}
-				}
-			]	
-		},{
-			"root": "pages/search/",//搜索分包模块
-			"pages": [
-				{
-					"path": "search",
-					"style": {
-						"navigationBarTitleText": "搜索"
-					}
-				},{
-					"path": "search-supplier",
-					"style": {
-						"navigationBarTitleText": "搜索供应商"
-					}
-				},{ 
-					"path": "search-instrument",
-					"style": {
-						"navigationBarTitleText": "搜索仪器"
-					}
-				},{
-					"path": "search-order",
-					"style": {
-						"navigationBarTitleText": "订单搜索"
-					}
-				},{
-					"path": "search-second",
-					"style": {
-						"navigationBarTitleText": "二手搜索"
-					}
-				}
-			]	
-		},{
-			"root": "pages/second/",
-			"pages": [
-				{
-					"path": "form/introduce",
-					"style": {
-						"navigationBarTitleText": "二手市场介绍",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "form/form",
-					"style": {
-						"navigationBarTitleText": "发布二手"
-					}
-				},
-				{
-					"path": "form/form-seller",
-					"style": {
-						"navigationBarTitleText": "发布二手"
-					}
-				},
-				{
-					"path": "product/product-list",
-					"style": {
-						"navigationBarTitleText": "二手商品",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "product/product-details",
-					"style": {
-						"navigationBarTitleText": "商品详情",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				}
-			]	
-		},
-		{
-			"root": "pages/supplier/",
-			"pages": [
-				{
-					"path": "index/index",
-					"style": {
-						"navigationBarTitleText": "采美采购商城",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},{
-					"path": "login/bind-operator",
-					"style": {
-						"navigationBarTitleText": "绑定微信"
-					}
-				},{
-					"path": "user/my-product",
-					"style": {
-						"navigationBarTitleText": "我的商品",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "user/my-shop",
-					"style": {
-						"navigationBarTitleText": "店铺主页",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "login/share-login",
-					"style": {
-						"navigationBarTitleText": "查看订单"
-					}
-				},{
-					"path": "login/share-info",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle":"custom"
-					}
-				},{
-					"path": "order/order-details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "user/supplier",
-					"style": {
-						"navigationBarTitleText": "供应商信息"
-					}
-				},{
-					"path": "order/order-list",
-					"style": {
-						"navigationBarTitleText": "我的订单",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "order/order-service-details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle":"custom",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "deliver/add-logistics",
-					"style": {
-						"navigationBarTitleText": "录入物流信息"
-					}
-				},
-				{
-					"path": "deliver/qualifications-add",
-					"style": {
-						"navigationBarTitleText": "上传商品资质"
-					}
-				},
-				{
-					"path": "deliver/qualifications-details",
-					"style": {
-						"navigationBarTitleText": "商品资质"
-					}
-				},
-				{
-					"path": "deliver/deliver-goods",
-					"style": {
-						"navigationBarTitleText": "发货",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "deliver/deliver-record",
-					"style": {
-						"navigationBarTitleText": "发货记录",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "deliver/logistics-list",
-					"style": {
-						"navigationBarTitleText": "物流公司"
-					}
-				},
-				{
-					"path": "user/setting/password",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-					}
-				},
-				{
-					"path": "user/setting/phone",
-					"style": {
-						"navigationBarTitleText": "更换手机号"
-					}
-				},
-				{
-					"path": "user/setting/setting",
-					"style": {
-						"navigationBarTitleText": "账户设置"
-					}
-				},
-				{
-					"path": "user/operator/list",
-					"style": {
-						"navigationBarTitleText": "运营人员管理"
-					}
-				},
-				{
-					"path": "user/operator/addoperator",
-					"style": {
-						"navigationBarTitleText": "添加运营人员"
-					}
-				},
-				{
-					"path": "user/information",
-					"style": {
-						"navigationBarTitleText": "资料信息"
-					}
-				}
-			]	
-		}	
-	],
-	"tabBar": {
-		"height":"80",
-		"color": "#999999",
-		"selectedColor": "#E15616",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/tabBar/home/index",
-				"iconPath": "static/icon-home@3x.png",
-				"selectedIconPath": "static/icon-home-active@3x.png",
-				"text": "商城"
-			},{
-				"pagePath": "pages/tabBar/category/index",
-				"iconPath": "static/icon-sort@3x.png",
-				"selectedIconPath": "static/icon-sort-active@3x.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/tabBar/cart/index",
-				"iconPath": "static/icon-cart@3x.png",
-				"selectedIconPath": "static/icon-cart-active@3x.png",
-				"text": "购物车"
-			},
-			{
-				"pagePath": "pages/tabBar/user/user",
-				"iconPath": "static/icon-user@3x.png",
-				"selectedIconPath": "static/icon-user-active@3x.png",
-				"text": "我的"
-			}
-		]
-	},
-	"easycom": {
-		"autoscan": true,
-		"custom": {
-			"tui-(.*)": "@/components/thorui/tui-$1/tui-$1.vue"
-		}
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "采美采购商城",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#FFFFFF"
-	},
-	"condition" : { //模式配置,仅开发期间生效
-		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面,必选
-				"query": "" //启动参数,在页面的onLoad函数里面得到
-			}
-		]
-	}
+    "subPackages": [{
+            "root": "pages/service/", //信息服务模块
+            "pages": [{
+                    "path": "aftersale",
+                    "style": {
+                        "navigationBarTitleText": "售后无忧"
+                    }
+                },
+                {
+                    "path": "service",
+                    "style": {
+                        "navigationBarTitleText": "采美365网"
+                    }
+                },
+                {
+                    "path": "shoppingnotice",
+                    "style": {
+                        "navigationBarTitleText": "购物须知"
+                    }
+                },
+                {
+                    "path": "sellconten",
+                    "style": {
+                        "navigationBarTitleText": "条款内容"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/goods/", //商品模块
+            "pages": [
+                /*美体节临时页面*/
+                {
+                    "path": "good-floor-temp",
+                    "style": {
+                        "navigationBarTitleText": "美体节",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "goods-instrument",
+                    "style": {
+                        "navigationBarTitleText": "项目仪器",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "goods-classify",
+                    "style": {
+                        "navigationBarTitleText": "商品列表",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "good-floorMore",
+                    "style": {
+                        "navigationBarTitleText": "更多楼层",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "good-floor",
+                    "style": {
+                        "navigationBarTitleText": "",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "goods-active",
+                    "style": {
+                        "navigationBarTitleText": "凑单商品",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "product",
+                    "style": {
+                        "navigationBarTitleText": "商品详情",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "instrument-details",
+                    "style": {
+                        "navigationBarTitleText": "项目仪器详情",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "cart",
+                    "style": {
+                        "navigationBarTitleText": "购物车",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "cart-index",
+                    "style": {
+                        "navigationBarTitleText": "购物车",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/login/", //注册登录模块
+            "pages": [{
+                    "path": "register",
+                    "style": {
+                        "navigationBarTitleText": "机构注册",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "register-supplier",
+                    "style": {
+                        "navigationBarTitleText": "供应商注册",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "register-select",
+                    "style": {
+                        "navigationBarTitleText": "选择身份"
+                    }
+                },
+                {
+                    "path": "apply",
+                    "style": {
+                        "navigationBarTitleText": "升级会员机构",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "apply-supplier",
+                    "style": {
+                        "navigationBarTitleText": "修改申请资料",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "logincode",
+                    "style": {
+                        "navigationBarTitleText": "邀请码登录"
+                    }
+                },
+                {
+                    "path": "login",
+                    "style": {
+                        "navigationBarTitleText": "登录"
+                    }
+                },
+                {
+                    "path": "binding",
+                    "style": {
+                        "navigationBarTitleText": "注册信息"
+                    }
+                },
+                {
+                    "path": "bindwechat",
+                    "style": {
+                        "navigationBarTitleText": "绑定微信"
+                    }
+                },
+                {
+                    "path": "bindOperator",
+                    "style": {
+                        "navigationBarTitleText": "绑定运营人员"
+                    }
+                },
+                {
+                    "path": "information",
+                    "style": {
+                        "navigationBarTitleText": "修改资料",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "password",
+                    "style": {
+                        "navigationBarTitleText": "修改密码"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user/", //机构个人中心模块
+            "pages": [{
+                    "path": "account/account",
+                    "style": {
+                        "navigationBarTitleText": "账户余额明细",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "account/account-bean",
+                    "style": {
+                        "navigationBarTitleText": "采美豆明细",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "address/addressManage",
+                    "style": {
+                        "navigationBarTitleText": "添加新地址"
+                    }
+                },
+                {
+                    "path": "address/address",
+                    "style": {
+                        "navigationBarTitleText": "地址列表"
+                    }
+                },
+                {
+                    "path": "about/about",
+                    "style": {
+                        "navigationBarTitleText": "关于我们"
+                    }
+                },
+                {
+                    "path": "regularPurchase/regularPurchase",
+                    "style": {
+                        "navigationBarTitleText": "再次购买"
+                    }
+                },
+                {
+                    "path": "order/create-order",
+                    "style": {
+                        "navigationBarTitleText": "确认订单"
+                    }
+                },
+                {
+                    "path": "order/success",
+                    "style": {
+                        "navigationBarTitleText": "支付结果",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "order/order-payment",
+                    "style": {
+                        "navigationBarTitleText": "选择支付方式",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "order/order-pay",
+                    "style": {
+                        "navigationBarTitleText": "收银台",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "order/orderShareLogin",
+                    "style": {
+                        "navigationBarTitleText": "输入分享码"
+                    }
+                },
+                {
+                    "path": "order/order-sharelogin",
+                    "style": {
+                        "navigationBarTitleText": "查看订单"
+                    }
+                },
+                {
+                    "path": "order/order-list",
+                    "style": {
+                        "navigationBarTitleText": "我的订单",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "order/order-details",
+                    "style": {
+                        "navigationBarTitleText": "订单详情",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "order/order-sharedetails",
+                    "style": {
+                        "navigationBarTitleText": "订单详情"
+                    }
+                },
+                {
+                    "path": "order/order-logistics",
+                    "style": {
+                        "navigationBarTitleText": "物流信息"
+                    }
+                },
+                {
+                    "path": "operator/list",
+                    "style": {
+                        "navigationBarTitleText": "运营人员管理"
+                    }
+                },
+                {
+                    "path": "operator/addoperator",
+                    "style": {
+                        "navigationBarTitleText": "添加运营人员"
+                    }
+                },
+                {
+                    "path": "setting/setting",
+                    "style": {
+                        "navigationBarTitleText": "账户设置"
+                    }
+                },
+                {
+                    "path": "setting/phone",
+                    "style": {
+                        "navigationBarTitleText": "更换手机号"
+                    }
+                },
+                {
+                    "path": "coupon/coupon",
+                    "style": {
+                        "navigationBarTitleText": "优惠券",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "coupon/coupon-collection",
+                    "style": {
+                        "navigationBarTitleText": "领券中心",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "coupon/coupon-exchange",
+                    "style": {
+                        "navigationBarTitleText": "兑换优惠券"
+                    }
+                },
+                {
+                    "path": "coupon/coupon-product",
+                    "style": {
+                        "navigationBarTitleText": "活动商品",
+                        "enablePullDownRefresh": true
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/seller/",
+            "pages": [{
+                    "path": "index/index",
+                    "style": {
+                        "navigationBarTitleText": "采美采购商城",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "login/login",
+                    "style": {
+                        "navigationBarTitleText": "登录",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "cart/cart",
+                    "style": {
+                        "navigationBarTitleText": "购物车"
+                    }
+                },
+                {
+                    "path": "cart/buyagain",
+                    "style": {
+                        "navigationBarTitleText": "再次购买"
+                    }
+                },
+                {
+                    "path": "cart/immediately",
+                    "style": {
+                        "navigationBarTitleText": "立即下单"
+                    }
+                }, {
+                    "path": "cart/second",
+                    "style": {
+                        "navigationBarTitleText": "二手下单"
+                    }
+                },
+                {
+                    "path": "order/create-order",
+                    "style": {
+                        "navigationBarTitleText": "确认订单"
+                    }
+                },
+                {
+                    "path": "order/create-recharge-order",
+                    "style": {
+                        "navigationBarTitleText": "确认订单"
+                    }
+                },
+                {
+                    "path": "order/order-details",
+                    "style": {
+                        "navigationBarTitleText": "订单详情",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "order/order-list",
+                    "style": {
+                        "navigationBarTitleText": "订单列表",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "order/order-sharedetails",
+                    "style": {
+                        "navigationBarTitleText": "订单详情",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "club/list",
+                    "style": {
+                        "navigationBarTitleText": "机构列表"
+                    }
+                },
+                {
+                    "path": "club/stayClub-list",
+                    "style": {
+                        "navigationBarTitleText": "待注册机构"
+                    }
+                },
+                {
+                    "path": "club/club-list",
+                    "style": {
+                        "navigationBarTitleText": "我的机构"
+                    }
+                },
+                {
+                    "path": "club/allClub-list",
+                    "style": {
+                        "navigationBarTitleText": "所有机构"
+                    }
+                },
+                {
+                    "path": "club/addoperator",
+                    "style": {
+                        "navigationBarTitleText": "邀请运营人员"
+                    }
+                },
+                {
+                    "path": "login/register",
+                    "style": {
+                        "navigationBarTitleText": "拉机构上线",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "login/register-select",
+                    "style": {
+                        "navigationBarTitleText": "拉机构上线"
+                    }
+                },
+                {
+                    "path": "login/register-general",
+                    "style": {
+                        "navigationBarTitleText": "普通机构"
+                    }
+                },
+                {
+                    "path": "login/register-member",
+                    "style": {
+                        "navigationBarTitleText": "会员机构"
+                    }
+                },
+                {
+                    "path": "login/information",
+                    "style": {
+                        "navigationBarTitleText": "修改资料",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "login/apply",
+                    "style": {
+                        "navigationBarTitleText": "修改申请信息",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "order/order-historylist",
+                    "style": {
+                        "navigationBarTitleText": "订单列表"
+                    }
+                }, {
+                    "path": "search/search-order",
+                    "style": {
+                        "navigationBarTitleText": "订单搜索"
+                    }
+                },
+                {
+                    "path": "address/address",
+                    "style": {
+                        "navigationBarTitleText": "选择地址"
+                    }
+                },
+                {
+                    "path": "address/addressManage",
+                    "style": {
+                        "navigationBarTitleText": "添加地址"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/h5/", //活动分包模块
+            "pages": [{
+                    "path": "activity/activity",
+                    "style": {
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "activity/activity_mid",
+                    "style": {
+                        "navigationBarTitleText": "年中大促",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "activity/meobohui",
+                    "style": {
+                        "navigationBarTitleText": "美博会",
+                        "enablePullDownRefresh": true
+                    }
+                }, {
+                    "path": "activity/couponExp",
+                    "style": {
+                        "navigationBarTitleText": "优惠券介绍",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "activity/activity-topic",
+                    "style": {
+                        "navigationBarTitleText": "活动专题",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "activity/activity-detail",
+                    "style": {
+                        "navigationBarTitleText": "活动专题",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "activity/activity-floorMore",
+                    "style": {
+                        "navigationBarTitleText": "更多",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "activity/meobohui-booth",
+                    "style": {
+                        "navigationBarTitleText": "展位图",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "activity/meobohui-supplier",
+                    "style": {
+                        "navigationBarTitleText": "参展商",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "article/page",
+                    "style": {
+                        "navigationBarTitleText": "采美采购平台",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "article/path",
+                    "style": {
+                        "navigationBarTitleText": "采美采购平台",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "article/page-image",
+                    "style": {
+                        "navigationBarTitleText": "采美采购平台"
+                    }
+                },
+                {
+                    "path": "article/path-live",
+                    "style": {
+                        "navigationBarTitleText": "采美采购平台",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "activity/activity-list",
+                    "style": {
+                        "navigationBarTitleText": "商品专题",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "other/repair",
+                    "style": {
+                        "navigationBarTitleText": "维修"
+                    }
+                },
+                {
+                    "path": "other/brand",
+                    "style": {
+                        "navigationBarTitleText": "品牌招商"
+                    }
+                },
+                {
+                    "path": "other/brands",
+                    "style": {
+                        "navigationBarTitleText": "品牌招商"
+                    }
+                }
+            ]
+        }, {
+            "root": "pages/search/", //搜索分包模块
+            "pages": [{
+                "path": "search",
+                "style": {
+                    "navigationBarTitleText": "搜索"
+                }
+            }, {
+                "path": "search-supplier",
+                "style": {
+                    "navigationBarTitleText": "搜索供应商"
+                }
+            }, {
+                "path": "search-instrument",
+                "style": {
+                    "navigationBarTitleText": "搜索仪器"
+                }
+            }, {
+                "path": "search-order",
+                "style": {
+                    "navigationBarTitleText": "订单搜索"
+                }
+            }, {
+                "path": "search-second",
+                "style": {
+                    "navigationBarTitleText": "二手搜索"
+                }
+            }]
+        }, {
+            "root": "pages/second/",
+            "pages": [{
+                    "path": "form/introduce",
+                    "style": {
+                        "navigationBarTitleText": "二手市场介绍",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "form/form",
+                    "style": {
+                        "navigationBarTitleText": "发布二手"
+                    }
+                },
+                {
+                    "path": "form/form-seller",
+                    "style": {
+                        "navigationBarTitleText": "发布二手"
+                    }
+                },
+                {
+                    "path": "product/product-list",
+                    "style": {
+                        "navigationBarTitleText": "二手商品",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "product/product-details",
+                    "style": {
+                        "navigationBarTitleText": "商品详情",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/supplier/",
+            "pages": [{
+                    "path": "index/index",
+                    "style": {
+                        "navigationBarTitleText": "采美采购商城",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                }, {
+                    "path": "login/bind-operator",
+                    "style": {
+                        "navigationBarTitleText": "绑定微信"
+                    }
+                }, {
+                    "path": "user/my-product",
+                    "style": {
+                        "navigationBarTitleText": "我的商品",
+                        "enablePullDownRefresh": true
+                    }
+                }, {
+                    "path": "user/my-shop",
+                    "style": {
+                        "navigationBarTitleText": "店铺主页",
+                        "enablePullDownRefresh": true
+                    }
+                }, {
+                    "path": "login/share-login",
+                    "style": {
+                        "navigationBarTitleText": "查看订单"
+                    }
+                }, {
+                    "path": "login/share-info",
+                    "style": {
+                        "navigationBarTitleText": "订单详情",
+                        "navigationStyle": "custom"
+                    }
+                }, {
+                    "path": "order/order-details",
+                    "style": {
+                        "navigationBarTitleText": "订单详情",
+                        "enablePullDownRefresh": true
+                    }
+                }, {
+                    "path": "user/supplier",
+                    "style": {
+                        "navigationBarTitleText": "供应商信息"
+                    }
+                }, {
+                    "path": "order/order-list",
+                    "style": {
+                        "navigationBarTitleText": "我的订单",
+                        "enablePullDownRefresh": true
+                    }
+                }, {
+                    "path": "order/order-service-details",
+                    "style": {
+                        "navigationBarTitleText": "订单详情",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "deliver/add-logistics",
+                    "style": {
+                        "navigationBarTitleText": "录入物流信息"
+                    }
+                },
+                {
+                    "path": "deliver/qualifications-add",
+                    "style": {
+                        "navigationBarTitleText": "上传商品资质"
+                    }
+                },
+                {
+                    "path": "deliver/qualifications-details",
+                    "style": {
+                        "navigationBarTitleText": "商品资质"
+                    }
+                },
+                {
+                    "path": "deliver/deliver-goods",
+                    "style": {
+                        "navigationBarTitleText": "发货",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "deliver/deliver-record",
+                    "style": {
+                        "navigationBarTitleText": "发货记录",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "deliver/logistics-list",
+                    "style": {
+                        "navigationBarTitleText": "物流公司"
+                    }
+                },
+                {
+                    "path": "user/setting/password",
+                    "style": {
+                        "navigationBarTitleText": "修改密码"
+                    }
+                },
+                {
+                    "path": "user/setting/phone",
+                    "style": {
+                        "navigationBarTitleText": "更换手机号"
+                    }
+                },
+                {
+                    "path": "user/setting/setting",
+                    "style": {
+                        "navigationBarTitleText": "账户设置"
+                    }
+                },
+                {
+                    "path": "user/operator/list",
+                    "style": {
+                        "navigationBarTitleText": "运营人员管理"
+                    }
+                },
+                {
+                    "path": "user/operator/addoperator",
+                    "style": {
+                        "navigationBarTitleText": "添加运营人员"
+                    }
+                },
+                {
+                    "path": "user/information",
+                    "style": {
+                        "navigationBarTitleText": "资料信息"
+                    }
+                }
+            ]
+        }
+    ],
+    "tabBar": {
+        "height": "80",
+        "color": "#999999",
+        "selectedColor": "#E15616",
+        "borderStyle": "black",
+        "backgroundColor": "#ffffff",
+        "list": [{
+                "pagePath": "pages/tabBar/home/index",
+                "iconPath": "static/icon-home@3x.png",
+                "selectedIconPath": "static/icon-home-active@3x.png",
+                "text": "商城"
+            }, {
+                "pagePath": "pages/tabBar/category/index",
+                "iconPath": "static/icon-sort@3x.png",
+                "selectedIconPath": "static/icon-sort-active@3x.png",
+                "text": "分类"
+            },
+            {
+                "pagePath": "pages/tabBar/cart/index",
+                "iconPath": "static/icon-cart@3x.png",
+                "selectedIconPath": "static/icon-cart-active@3x.png",
+                "text": "购物车"
+            },
+            {
+                "pagePath": "pages/tabBar/user/user",
+                "iconPath": "static/icon-user@3x.png",
+                "selectedIconPath": "static/icon-user-active@3x.png",
+                "text": "我的"
+            }
+        ]
+    },
+    "easycom": {
+        "autoscan": true,
+        "custom": {
+            "tui-(.*)": "@/components/thorui/tui-$1/tui-$1.vue"
+        }
+    },
+    "globalStyle": {
+        "navigationBarTextStyle": "black",
+        "navigationBarTitleText": "采美采购商城",
+        "navigationBarBackgroundColor": "#FFFFFF",
+        "backgroundColor": "#FFFFFF"
+    },
+    "condition": { //模式配置,仅开发期间生效
+        "current": 0, //当前激活的模式(list 的索引项)
+        "list": [{
+            "name": "", //模式名称
+            "path": "", //启动页面,必选
+            "query": "" //启动参数,在页面的onLoad函数里面得到
+        }]
+    }
 }

+ 7 - 7
services/ajax.env.js

@@ -1,15 +1,15 @@
 let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
-	// URL_CONFIG = 'http://192.168.2.81:8008'
-	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
+    // URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+    // URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+    // URL_CONFIG = 'http://192.168.2.81:8008'
+    // URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
     URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
-}else{
+    // URL_CONFIG = 'https://spi.caimei365.com'
+}else{ 
     // 生产环境
-	// URL_CONFIG = 'https://spi-b.caimei365.com'
+    // URL_CONFIG = 'https://spi-b.caimei365.com'
     URL_CONFIG = 'https://spi.caimei365.com'
 }
 export default URL_CONFIG

+ 5 - 5
services/config.env.js

@@ -2,12 +2,12 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	URL_CONFIG = 'https://core-b.caimei365.com'
-	// URL_CONFIG = 'https://core.caimei365.com'
+    // URL_CONFIG = 'http://192.168.2.68:18002'	 //裴裴联调地址
+    URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
-	// URL_CONFIG = 'https://core-b.caimei365.com'
-	URL_CONFIG = 'https://core.caimei365.com'
+    // URL_CONFIG = 'https://core-b.caimei365.com'
+    URL_CONFIG = 'https://core.caimei365.com'
 }
 export default URL_CONFIG