Administrator 4 years ago
parent
commit
3cba151063

+ 4 - 2
components/cm-module/productDetails/secondPrice.vue

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

+ 3 - 4
second/pages/product/product-details.vue

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

+ 1 - 1
second/pages/product/product-list.vue

@@ -53,7 +53,7 @@
 		                    </a>
 		                    </a>
 		                    <view class="targetprice" >
 		                    <view class="targetprice" >
 		                        <span v-if="item.detailTalkFlag ==2 && hasLogin==false">价格详聊</span>
 		                        <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-if="hasLogin && item.detailTalkFlag==2">价格详聊</span>
 		                        <span v-else>¥{{item.price1Str}}</span>
 		                        <span v-else>¥{{item.price1Str}}</span>
 		                    </view>
 		                    </view>

+ 1 - 1
seller/pages/order/order-list.vue

@@ -396,7 +396,7 @@
 				this.aganOrderID = id;
 				this.aganOrderID = id;
 				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:0}).then(res =>{
 				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:0}).then(res =>{
 					if(res.code==0){
 					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');
 						this.$api.navigateTo('/seller/pages/cart/cart');
 					}
 					}
 				}).catch(error =>{
 				}).catch(error =>{