Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

components/cm-module/cm-seller/home.vue

@@ -235,22 +235,6 @@
 				console.log(e.detail.path)
 				console.log(e.detail.query)
 			},
-			showTost(){
-				this.$util.msg("功能开发中，敬请期待~",2000)
-				// this.$api.navigateTo(`/seller/pages/login/login`)
-				// uni.navigateToMiniProgram({
-				// 	appId: 'wx5a5cda32926f55ac',
-				// 	path: '/pages/tabBar/home/index',
-				// 	extraData: {
-				// 		'data1': 'test'
-				// 	},
-				// 	envVersion: 'develop',
-				// 	success(res) {
-				// 		console.log(res)
-				// 		// 打开成功
-				// 	}
-				// })
-			},
 			navto(url){
 				this.$api.navigateTo(url)
 			},

components/cm-module/creatOrder/invoiceTent.vue

@@ -34,7 +34,7 @@
 						</view>
 						<view class="invoice-from">
 							<view class="label">注册地址:</view>
-							<input class="form-input" type="text" v-model="invoiceData.registeredAddress" placeholder="请填写单位注册地址(必填)" maxlength="30">
+							<input class="form-input" type="text" v-model="invoiceData.registeredAddress" placeholder="请填写单位注册地址(必填)" maxlength="100">
 						</view>
 						<view class="invoice-from">
 							<view class="label">注册电话:</view>

components/cm-module/creatOrder/sellerInvoice.vue

@@ -37,7 +37,7 @@
 						</view>
 						<view class="invoice-from">
 							<view class="label">注册地址:</view>
-							<input class="form-input" type="text" v-model="invoiceData.registeredAddress" placeholder="请填写单位注册地址(必填)" placeholder-class="placeholder" maxlength="30">
+							<input class="form-input" type="text" v-model="invoiceData.registeredAddress" placeholder="请填写单位注册地址(必填)" placeholder-class="placeholder" maxlength="100">
 						</view>
 						<view class="invoice-from">
 							<view class="label">注册电话:</view>

components/cm-module/homeIndex/hotProduct.vue

@@ -138,6 +138,15 @@
 		created(){
 			this.initData(this.list)
 		},
+		watch: {
+			list: {
+				handler: function (el) {//监听对象的变换使用 function，箭头函数容易出现this指向不正确
+					this.list = el
+					this.initData(this.list)
+				},
+				deep: true
+			}
+		},
 		computed: {
 			...mapState(['hasLogin','userInfo','isActivity'])
 		},
@@ -147,6 +156,7 @@
 					this.shopId = resolve.shopID
 				})
 				if(res.length>0){
+					this.hotProductList.splice(0,this.hotProductList.length);
 					for (var i = 0, j = res.length; i < j; i += this.pageSize) {
 						this.hotProductList.push(res.slice(i, i + this.pageSize));
 					}

components/cm-module/homeIndex/pagesProduct.vue

@@ -54,7 +54,6 @@
 				this.pagesProductList = res
 			},
 			NavToDetailPage(floor) {//跳转
-				console.log(floor)
 				/**
 				 * 页面跳转类型
 				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页

components/cm-module/homeIndex/specialProduct.vue

@@ -53,7 +53,20 @@
 				this.current = index;
 			},
 			NavToDetailMoreSpecia(){//跳转商品专题列表
-				 this.$api.navigateTo('/h5/pages/activity/activity-list')
+				this.$api.navigateTo('/h5/pages/activity/activity-list')
+				// this.$util.msg("功能开发中，敬请期待~",2000)
+				// uni.navigateToMiniProgram({
+				// 	appId: 'wx92d650b253f8f2e3',
+				// 	path: '/pages/index/index',
+				// 	extraData: {
+				// 		'data1': 'test'
+				// 	},
+				// 	envVersion: 'develop',
+				// 	success(res) {
+				// 		console.log(res)
+				// 		// 打开成功
+				// 	}
+				// })
 			},
 			NavToDetailPage(floor) {//跳转
 				console.log(floor)

components/cm-module/listTemplate/commodityList.vue

@@ -150,7 +150,6 @@
 				totalPage: 1,
 				pullFlag: true,
 				cartNum: 0,
-				identity:2,
 			}
 		},
 		created() {		
@@ -161,11 +160,6 @@
 				this.userID = resolve.userID ? resolve.userID : 0;
 				this.shopId = resolve.shopID ? resolve.shopID : 0;
 				this.userIdentity = resolve.userIdentity
-				if(this.userIdentity == 1){
-					this.identity = 1
-				}else{
-					this.identity = 2
-				}
 				this.getListFromServer();
 			}).catch(error =>{
 				this.getListFromServer();
@@ -177,7 +171,7 @@
 			},
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo'])
+			...mapState(['hasLogin','userInfo','identity'])
 		},
 		methods:{
 			toLower() {

components/cm-module/listTemplate/productList.vue

@@ -119,7 +119,7 @@
 			},
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo'])
+			...mapState(['hasLogin','userInfo','identity'])
 		},
 		methods:{
 			scrolltolower() {
@@ -138,7 +138,7 @@
 				this.loadingText = '加载中';
 				this.isShowEmpty = false;				
 				if(loadMore) {this.pageNum += 1;}
-				let params = {userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}
+				let params = {userId:this.userID,identity:this.identity,pageNum:this.pageNum,pageSize:this.pageSize}
 				this.ProductService.GetRepeatBuyAgainProductList(params).then(response =>{
 					this.isShowWrapper = true
 					this.cartQuantity = response.data.cartQuantity

components/cm-module/productDetails/recommend.vue

@@ -12,6 +12,7 @@
 </template>
 
 <script>
+	import { mapState,mapMutations} from 'vuex';
 	import authorize from '@/common/config/authorize.js'
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
@@ -45,9 +46,12 @@
 			this.productID = this.queryProductid
 			this.infoRecommend(this.queryProductid,this.queryType)
 		},
+		computed: {
+			...mapState(['identity'])
+		},
 		methods:{
 			infoRecommend(id,type){
-				this.ProductService.queryProductDetilsRelevant({ productId:id,recommendType:type ? type : 0 }).then(response =>{
+				this.ProductService.queryProductDetilsRelevant({ productId:id,recommendType:type ? type : 0,identity:this.identity }).then(response =>{
 					if( response.data && response.data.length > 0){
 						this.isEmpty = false
 						this.recommendList = response.data

components/cm-module/supplier/home.vue

@@ -235,22 +235,6 @@
 				console.log(e.detail.path)
 				console.log(e.detail.query)
 			},
-			showTost(){
-				this.$util.msg("功能开发中，敬请期待~",2000)
-				// this.$api.navigateTo(`/seller/pages/login/login`)
-				// uni.navigateToMiniProgram({
-				// 	appId: 'wx5a5cda32926f55ac',
-				// 	path: '/pages/tabBar/home/index',
-				// 	extraData: {
-				// 		'data1': 'test'
-				// 	},
-				// 	envVersion: 'develop',
-				// 	success(res) {
-				// 		console.log(res)
-				// 		// 打开成功
-				// 	}
-				// })
-			},
 			navto(url){
 				this.$api.navigateTo(url)
 			},

h5/pages/activity/activity.vue

@@ -23,6 +23,10 @@
 		onLoad(option) {
 			console.log(option)
 			switch(option.id){
+				case '276':
+					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_04.html'
+					uni.setNavigationBarTitle({title:'保信亚太全脂然,买二送一'});
+					break;
 				case '277':
 					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_01.html'
 					uni.setNavigationBarTitle({title:'三昭国际优惠'});
@@ -31,18 +35,14 @@
 					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_02.html'
 					uni.setNavigationBarTitle({title:'点斗优惠'});
 					break;
-				case '280':
-					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_03.html'
-					uni.setNavigationBarTitle({title:'唯美概念DEP优惠'});
-					break;
-				case '276':
-					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_04.html'
-					uni.setNavigationBarTitle({title:'保信亚太全脂然,买二送一'});
-					break;
 				case '281':
 					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_05.html'
 					uni.setNavigationBarTitle({title:'润月雅优惠'});
 					break;
+				case '282':
+					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_06.html'
+					uni.setNavigationBarTitle({title:'中胚层专场'});
+					break;
 				case '223':
 					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
 					uni.setNavigationBarTitle({title:'品牌OEM服务'});

manifest.json

@@ -65,7 +65,10 @@
         },
         "usingComponents" : true,
         "permission" : {},
-        "navigateToMiniProgramAppIdList" : [ "wx5a5cda32926f55ac" ]
+        "navigateToMiniProgramAppIdList" : [ "wx5a5cda32926f55ac" ],
+        "uniStatistics" : {
+            "enable" : true
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

pages/goods/product.vue

@@ -366,11 +366,11 @@
 			this.getWinHeight()
 		},
 		computed: {
-			...mapState(['hasLogin','isWxAuthorize'])
+			...mapState(['hasLogin','isWxAuthorize','identity'])
 		},
 		methods:{
 			initData(){// 初始化商品详情查询
-				this.ProductService.queryProductDetils({userId:this.userID,productID:this.productID}).then(response =>{	
+				this.ProductService.queryProductDetils({userId:this.userID,productID:this.productID,identity:this.identity}).then(response =>{	
 					this.skeletonShow = false
 					this.productImage=[];
 					this.shop = response.data.shop

pages/search/search.vue

@@ -152,7 +152,6 @@
 				themeClass: 'block',
 				show:false,
 				userIdentity:'',	
-				identity:2,
 				searchKeyType:1,
 				isShowClose:false,	//是否显示清空输入框图标
 				isSearchHistory:false,//是都显示搜索历史
@@ -183,15 +182,12 @@
 		},
 		onLoad(option) {
 			console.log(option)
+			
 			this.$api.getStorage().then((resolve) =>{
 				this.userID = resolve.userID ? resolve.userID : 0;
 				this.shopId = resolve.shopID ? resolve.shopID : 0;
-				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : '';
-				if(this.userIdentity == 1){
-					this.listQuery.identity = 1
-				}else{
-					this.listQuery.identity = 2
-				}
+				this.userIdentity = resolve.userIdentity;
+				this.listQuery.identity = this.identity;
 				if(option.keyWord){
 					this.listQuery.keyword = option.keyWord
 					this.setSearchHistoryAdd()
@@ -209,7 +205,7 @@
 			},
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo'])
+			...mapState(['hasLogin','userInfo','identity'])
 		},
 		methods:{
 			initGetSerachRecord(){//查询搜索历史记录
@@ -221,7 +217,7 @@
 			},
 			subMitSearch() {//搜索
 				if (this.listQuery.keyword == '') {
-					this.$util.msg('请输入商品关键词',2000);
+					this.$util.msg('请输入搜索关键词',2000);
 				}else{
 					switch(this.searchKeyType){
 						case 1:
@@ -708,6 +704,7 @@
 				padding:0 16rpx;
 				font-size: $font-size-20;
 				margin-left: 15rpx;
+				margin-top:15px;
 				border: 1px solid #E15616;
 				float: right;
 			}

pages/tabBar/home/index.vue

@@ -127,7 +127,7 @@
 			
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo','isActivity'])
+			...mapState(['hasLogin','userInfo','identity'])
 		},
 		methods: {
 			...mapMutations(['login','logout']),
@@ -213,7 +213,7 @@
 				})
 			},
 			GetHomeRecommendInfo(){//首页热门推荐
-				this.CommonService.GetHomeRecommendInfo().then(response =>{
+				this.CommonService.GetHomeRecommendInfo({identity:this.identity}).then(response =>{
 					this.RecommendList = response.data
 					this.GetProductPrice()
 				})
@@ -309,22 +309,6 @@
 				console.log(e.detail.path)
 				console.log(e.detail.query)
 			},
-			showTost(){
-				this.$util.msg("功能开发中，敬请期待~",2000)
-				// this.$api.navigateTo(`/seller/pages/login/login`)
-				// uni.navigateToMiniProgram({
-				// 	appId: 'wx5a5cda32926f55ac',
-				// 	path: '/pages/tabBar/home/index',
-				// 	extraData: {
-				// 		'data1': 'test'
-				// 	},
-				// 	envVersion: 'develop',
-				// 	success(res) {
-				// 		console.log(res)
-				// 		// 打开成功
-				// 	}
-				// })
-			},
 			navto(url){
 				this.$api.navigateTo(url)
 			},

seller/pages/order/order-historylist.vue

@@ -284,25 +284,28 @@
 				}, 600);	
 			}, 
 			getOnReachBottomData(index){//上拉加载
-				let params = {listType:index,orderSubmitType:this.screenTab,serviceProviderId:this.serviceProviderId,pageNum:this.pageNum+=1,pageSize:this.pageSize};
-				this.SellerService.GetSellerOrderList(params).then(response =>{
-					let orderItem = this.orderTabBar[index];
-					let resData = response.data.results
-					this.hasNextPage = response.data.hasNextPage;
-					orderItem.orderList = orderItem.orderList.concat(resData)
-					this.pullFlag = false;// 防上拉暴滑
-					setTimeout(()=>{this.pullFlag = true;},500)
-					if(this.hasNextPage){
-						this.pullUpOn = false
-						this.nomoreText = '上拉显示更多'
-					}else{
-						this.loadding = false
-						this.pullUpOn = false
-						this.nomoreText = '已至底部'
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
+				this.pageNum += 1
+				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+					let params = {listType:index,clubID:resolve.clubID,orderSubmitType:this.screenTab,serviceProviderId:this.serviceProviderId,pageNum:this.pageNum,pageSize:this.pageSize};
+					this.SellerService.GetSellerClubOrderList(params).then(response =>{
+						let orderItem = this.orderTabBar[index];
+						let resData = response.data.results
+						this.hasNextPage = response.data.hasNextPage;
+						orderItem.orderList = orderItem.orderList.concat(resData)
+						this.pullFlag = false;// 防上拉暴滑
+						setTimeout(()=>{this.pullFlag = true;},500)
+						if(this.hasNextPage){
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						}else{
+							this.loadding = false
+							this.pullUpOn = false
+							this.nomoreText = '已至底部'
+						}
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})	
 			},
 			scrolltolower() {
 				if(this.hasNextPage){

services/ajax.env.js

@@ -4,8 +4,8 @@ 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.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
 	// URL_CONFIG = 'https://spi-b.caimei365.com'

store/index.js

@@ -9,6 +9,7 @@ const store = new Vuex.Store({
 		isWxAuthorize:false,
 		hasLogin: false,
 		userInfo: {},
+		identity:0,
 		wechatUserInfo:{},
 		cartNumber:0,
 		isIphoneX:false,
@@ -48,6 +49,14 @@ const store = new Vuex.Store({
 			let TIME = api.formatDate()
 			console.log(`${TIME}`,provider)
 			state.userInfo = provider;
+			if(provider.userIdentity){
+				state.identity = provider.userIdentity
+			}else if(provider.userID == 5261 || provider.userID == 10947 || provider.userID == 11579){
+				state.identity = 1;
+			}else{
+				state.identity = 0;
+			}
+			console.log('用户类型',state.identity)
 			uni.setStorage({//缓存用户登陆状态
 			    key: 'userInfo',
 			    data: provider