COMMIT -M

components/cm-module/homeIndex/navbars.vue

@@ -62,7 +62,7 @@
 						 	10:`/second/pages/product/product-list`,
 						 	14:`/h5/pages/other/brand`,
 						 	15:`/h5/pages/other/repair`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	18:`/h5/pages/article/path?link=${pros.link}`,
 						 	20:`/pages/goods/good-floor?linkId=${pros.linkParam.id}&title=${pros.name}`
 						 }
 						const url = typeMap[pros.linkType];

components/cm-module/homeIndex/pageSpecial.vue

@@ -236,9 +236,11 @@
 				font-size: $font-size-26;
 				&.icon-weikaishi{
 					color: #E56D00;
+					left:0;
 				}
 				&.icon-jieshu{
 					color: #333333;
+					left:0;
 				}
 			}
 		}

h5/pages/article/path.vue

@@ -0,0 +1,42 @@
+<template>
+	<view class="activity">
+		<!-- <image @click.stop="navToDetailPage" src="https://img.caimei365.com/group1/M00/03/9A/Cmis216Zf8GAb_UqABE6NiwUUZs004.jpg" mode="widthFix"></image> -->
+	   <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+	    data() {
+	        return {
+	            webviewStyles: {
+	                progress: {
+	                    color: '#FF3333'
+	                }
+	            },
+				productID:'',
+				activityPath:'',
+				
+	        }
+	    },
+		onLoad(option) {
+			this.activityPath = option.link
+		},
+		methods:{
+			navToDetailPage() {//跳转商品详情页
+				this.$api.navigateTo(`/pages/goods/product?id=${this.productID}`)
+			},
+		}
+	}
+</script>
+	
+<style lang="scss">
+	.activity{
+		width: 100%;
+		height: auto;
+		image{
+			width: 100%;
+			height: auto;
+		}
+	}
+</style>

main.js

@@ -44,8 +44,9 @@ uma.init({
 uma.install = function (Vue) {
 	Vue.prototype.$uma = uma;
 }
-
 // #endif
+
+
 Vue.config.productionTip = false
 Vue.prototype.$fire = new Vue();
 Vue.prototype.$store = store;

pages.json

@@ -506,6 +506,13 @@
 						"enablePullDownRefresh":true
 					}
 				},
+				{
+					"path": "pages/article/path",
+					"style": {
+						"navigationBarTitleText": "采美365",
+						"enablePullDownRefresh":true
+					}
+				},
 				{
 					"path": "pages/activity/activity-list",
 					"style": {

pages/tabBar/category/index.vue

@@ -20,13 +20,13 @@
 							<view class="title">{{small.name}}</view>
 							<view class="list" v-if="small.tinytypeList.length > 0">
 								<view class="box" v-for="(pro,proIndex) in small.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
-									<image :src="pro.icon"></image>
+									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">{{pro.name}}</view>
 								</view>
 							</view>
 							<view v-else class="no-data">
 								<view class="box" @click.stop="navToListPage(small,2)">
-									<image src="https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
+									<image :src="small.crmIcon ? small.crmIcon : 'https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>

pages/user/order/order-sharelogin.vue

@@ -86,6 +86,7 @@
 				})
 			},
 			getOrderCommodityData(){//查询订单商品信息s
+				console.log('22222222222')
 				this.OrderService.OrderCommodityData({orderId:this.orderID}).then(response =>{
 					this.productList = response.data
 					this.isShareStatus = true

second/pages/product/product-list.vue

@@ -298,7 +298,7 @@
 		      // 来自页面内转发按钮
 		    }
 			return {
-			  title: `做项目找仪器，上采美`,
+			  title: `欢迎来到采美二手市场~`,
 			  path: `pages/search/search-instrument?keyWord=${this.listQuery.keyword}`
 			}
 		},	

services/ajax.env.js

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

services/order.service.js

@@ -46,7 +46,7 @@ export default class OrderService {
 	 * @param orderID
 	 */
 	OrderShareCode (data = {}) {
-		return this.AjaxService.get({ url:'/order/shareCode', data, isLoading: true })
+		return this.AjaxService.get({ url:'/order/shareCode', data, isLoading: true,isStatus: true })
 	}
 	/**
 	 *机构搜索订单