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

common/config/config.js

@@ -1,6 +1,8 @@
 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.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址

components/cm-module/productDetails/secondPrice.vue

@@ -1,7 +1,7 @@
 <template name="second-price">
 	<!-- 商品详情价格判断 -->
 	<view class="wrap-main">
-		<template v-if="hasLogin">
+		<template v-if="!hasLogin">
 			<view class="p-login grade tui-skeleton-fillet">
 				<view class="floor-item-btn" v-if="product.detailTalkFlag !=2">
 					<view class="btn" @click.stop="loginClick">登录查看价格</view>
@@ -52,7 +52,9 @@
 			...mapState(['hasLogin','isWxAuthorize'])
 		},
 		methods:{
-			
+			loginClick(){
+				this.$api.navigateTo('/pages/login/login')
+			},
 		},
 		
 	}

pages/user/setting/setting.vue

@@ -58,8 +58,8 @@
 	}
 	page,.container{
 		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-		border-top: 1px solid #EBEBEB;
+		background: #fff;
+		/* border-top: 1px solid #EBEBEB; */
 	}
 	.foot-list{
 		width: 100%;
@@ -80,14 +80,14 @@
 		position:relative;
 		background: $bg-color;
 		justify-content: center;
-		// border-bottom: 1px solid #EBEBEB;
+		border-bottom: 1px solid #EBEBEB;
 		&.cell-hover{
 			background:#fafafa;
 		}
 		.cell-more{
 			align-self: baseline;
 			font-size:$font-size-28;
-			color:$text-color;
+			color:#b2b2b2;
 			margin-left:10rpx;
 			.txt{
 				color: #999999;
@@ -97,7 +97,7 @@
 		.cell-tit{
 			flex: 1;
 			font-size: $font-size-28;
-			color: $text-color;
+			color: #666666;
 			margin-right:10rpx;
 		}
 		.cell-tip{

second/pages/product/product-details.vue

@@ -47,7 +47,7 @@
 					<view class="product-wrap clearfix">
 						<view class="wrap-top" >
 							<view class="wrap-top-price">
-								<second-price v-if="isRequest" :product="product"></second-price>
+								<second-price :product="product"></second-price>
 							</view>
 							<view class="p-title tui-skeleton-fillet">
 								<view class="p-title-name">
@@ -139,7 +139,7 @@
 <script>
 	import { mapState,mapMutations } from 'vuex'
 	import customP from '@/components/cm-module/headerNavbar/header-poduct' 		 //自定义导航
-	import cmPrice from "@/components/cm-module/productDetails/secondPrice.vue" //价格显示
+	import secondPrice from "@/components/cm-module/productDetails/secondPrice.vue" //价格显示
 	import authorize from '@/common/config/authorize.js'
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
@@ -153,7 +153,7 @@
 			customP,
 			tuiSkeleton,
 			recommend,
-			cmPrice,
+			secondPrice,
 			cmParameter,
 		},
 		data(){
@@ -402,7 +402,6 @@
 				width: 60rpx;
 				height: 2px;
 				border-radius: 1px;
-				background: #FFFFFF;
 				position: absolute;
 				bottom: 0;
 				left: 50%;

second/pages/product/product-list.vue

@@ -53,7 +53,7 @@
 		                    </a>
 		                    <view class="targetprice" >
 		                        <span v-if="item.detailTalkFlag ==2 && hasLogin==false">价格详聊</span>
-		                        <span v-else-if="hasLogin==false" class="priceparam">登录查看价格</span>
+		                        <span v-else-if="!hasLogin" class="priceparam">登录查看价格</span>
 		                        <span v-else-if="hasLogin && item.detailTalkFlag==2">价格详聊</span>
 		                        <span v-else>￥{{item.price1Str}}</span>
 		                    </view>

seller/pages/order/order-list.vue

@@ -396,7 +396,7 @@
 				this.aganOrderID = id;
 				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:0}).then(res =>{
 					if(res.code==0){
-						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds})
+						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
 						this.$api.navigateTo('/seller/pages/cart/cart');
 					}
 				}).catch(error =>{

services/ajax.env.js

@@ -1,6 +1,8 @@
 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.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址

supplier/pages/user/information.vue

@@ -291,8 +291,8 @@
 					{value:'13',name:'纤体减肥'}
 				],
 				params:{
-					userID:10450,
-					shopID:10087,
+					userID:'',
+					shopID:'',
 					townID:'',
 					provinceID: '',//省id
 					cityID: '',
@@ -337,10 +337,8 @@
 			}
 		},
 		onLoad() {
-			// this.$api.getComStorage('userInfo').then((resolve) =>{
-			// 	this.params.userID = resolve.userID;
-			// 	this.params.shopID = resolve.shopID;
-			// })
+		},
+		created() {
 			this.shopInfo();
 		},
 		methods:{
@@ -377,8 +375,11 @@
 				return _ARRAY
 			},
 		  shopInfo(){
-			  // this.$api.getStorage().then((resolve) =>{
-				  this.ShopService.shopInfo({userId:10450}).then(response =>{
+			  this.$api.getStorage().then((resolve) =>{
+				  this.params.userID = resolve.userID;
+				  this.params.shopID = resolve.shopID;
+				  	console.log(resolve)
+				  this.ShopService.shopInfo({userId:this.params.userID}).then(response =>{
 					if(response.code==0){
 						console.log(response)
 						let shop = response.data.shop;
@@ -432,7 +433,7 @@
 						}
 					}
 				 })
-				 // })
+				 })
 			 },
 			shopSubmit(){//提交修改
 				console.log(this.params);