Browse Source

测试文档Bug修复

huangzhe 3 years ago
parent
commit
934f9d0f42

+ 12 - 4
src/components/basic-component/app-layout/app-user-login/app-user-login.vue

xqd xqd
@@ -16,11 +16,11 @@
 			<view>
 			    <app-hotspot :hotspot="userprivacy">
 			        <view class="main-left cross-center login-userprivacy">
-						<view class="login-userprivacy-radio" @click="$jump({'open_type':'navigate','url':'/pages/user-center/privacyAgreement/privacyAgreement'})" :style="{'border':`2px solid ${readUserAgreement?'#A2834F':'#CDCDCD'}`}">
-							<view class="login-userprivacy-radio-check" v-show="readUserAgreement"  @click="$jump({'open_type':'navigate','url':'/pages/user-center/privacyAgreement/privacyAgreement'})"></view>
+						<view class="login-userprivacy-radio" @click="navPrivacyAgreement" :style="{'border':`2px solid ${readUserAgreement?'#A2834F':'#CDCDCD'}`}">
+							<view class="login-userprivacy-radio-check" v-show="readUserAgreement"  @click="navPrivacyAgreement"></view>
 						</view>
-						<text  @click="$jump({'open_type':'navigate','url':'/pages/user-center/privacyAgreement/privacyAgreement'})">登录即表示同意</text> 
-						<text style="color: #A2834F;margin-left: 5rpx;" @click="$jump({'open_type':'navigate','url':'/pages/user-center/privacyAgreement/privacyAgreement'})">用户隐私协议</text>
+						<text  @click="navPrivacyAgreement">登录即表示同意</text> 
+						<text style="color: #A2834F;margin-left: 5rpx;" @click="navPrivacyAgreement">用户隐私协议</text>
 					</view>
 			    </app-hotspot>
 			</view>
@@ -142,6 +142,14 @@
             });
         },
         methods: {
+			navPrivacyAgreement(){
+				let url= this.$platDiff.routeWithOption()
+				this.$jump({
+					// 'open_type':'redirect',
+					'open_type':'navigate',
+					'url':`/pages/user-center/privacyAgreement/privacyAgreement?url=${url}`,
+				})
+			},
             link() {
                 this.$store.commit('user/showLoginModal', false);
             },

+ 1 - 0
src/core/jump.js

xqd
@@ -71,6 +71,7 @@ const jump = function(data) {
             this.$platDiff.reload();
             // #endif
             // #ifndef MP-ALIPAY
+			console.log('this.$platDiff.routeWithOption()',this.$platDiff.routeWithOption())
             uni.redirectTo({
                 url: this.$platDiff.routeWithOption()
             });

+ 7 - 3
src/pages/order-submit/order-submit.vue

xqd xqd xqd
@@ -490,7 +490,7 @@
 				<view class="box-grow-1 cross-center u-submit-bar-height">
 					<view class="price-info">
 						<view :class="[themeTextClass]"
-							:style="{'color': !is_gift ? theme.color : '','font-size': '26rpx'}">
+							:style="{'color': '#222222','font-size': '30rpx'}">
 							{{totalTitle}}:
 							<text v-for="(custom_currency, ccIndex) in previewData.custom_currency_all" :key="ccIndex">
 								{{custom_currency}}+
@@ -503,9 +503,13 @@
 									v-else>¥{{balance <0 ? setPrice(previewData.total_price, balance) : FlorPrice(previewData.total_price)}}</template>
 							</text>
 						</view>
-						<view v-if="previewData.vip_card_price > 0" :class="[themeTextClass]"
+						<!-- <view v-if="previewData.vip_card_price > 0" :class="[themeTextClass]"
 							:style="{'color': !is_gift ? theme.color : '','font-size': '20rpx'}">包含SVIP费用:
 							¥{{previewData.vip_card_price}}
+						</view> -->
+						<view v-if="previewData.mch_list[0].total_discounts_price > 0" 
+							:style="{'color': '#999','font-size': '22rpx','margin-left':'74rpx'}">共优惠:
+							¥{{previewData.mch_list[0].total_discounts_price}}元
 						</view>
 					</view>
 				</view>
@@ -1663,7 +1667,7 @@
 			padding: 0 0;
 
 			>view {
-				margin: #{16rpx} 0;
+				margin: #{2rpx} 0;
 			}
 		}
 

+ 2 - 2
src/pages/order/search/search.vue

xqd
@@ -199,8 +199,8 @@
                 this.dialog = false;
             },
             timeChange: function (e) {
-                const val = +e.detail.value;
-                this.timeVal = +e.detail.value;
+                const val = e.detail.value;
+                this.timeVal = e.detail.value;
                 let years = this.years;
                 let year = this.years[val[0]];
                 let month = this.months[val[1]];

+ 32 - 23
src/pages/user-center/privacyAgreement/privacyAgreement.vue

xqd xqd xqd xqd
@@ -3,19 +3,24 @@
 		<view v-html="content"></view>
 		<view style="height: 200rpx;"></view>
 		<view class="login-btn-box">
-			<button class="main-center cross-center login-btn" :style="{'opacity':readUserAgreement?'1':'0.39'}" v-if="content" @click="login">
+			<button class="main-center cross-center login-btn" :style="{'opacity':readUserAgreement?'1':'0.39'}"
+				v-if="content" @click="login">
 				<image style="width: 40rpx;height: 40rpx;margin-right: 10rpx;"
-					src="https://t17.9026.com/web/statics/image/index/wxlogin.png" mode=""></image>立即登录
+					src="https://t17.9026.com/web/statics/image/index/wxlogin.png" mode=""></image>同意
 			</button>
 		</view>
 	</view>
 </template>
 
 <script>
-	import {mapState,mapMutations} from 'vuex'
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
 	export default {
 		data() {
 			return {
+				url:'',
 				content: `<p>欢迎您使用腾讯企点软件及服务!
 
 为使用腾讯企点软件(以下统称“本软件”)及服务,您应当阅读并遵守《腾讯企点软件许可及服务协议》(以下简称“本协议”),以及《腾讯服务协议》(链接地址:http://www.qq.com/contract.shtml,若链接地址变更的,则以变更后的链接地址所对应的内容为准;其他链接地址变更的情形,均适用前述约定)、《QQ软件许可及服务协议》、《QQ号码规则》(链接地址:http://zc.qq.com/chs/agreement1_chs.html)以及专项规则等。请您务必审慎阅读、充分理解各条款内容,特别是免除或者限制责任的条款,以及开通或使用某项服务的单独协议,并选择接受或不接受。限制、免责条款可能以加粗形式提示您注意。
@@ -70,35 +75,38 @@
 </p>`
 			};
 		},
-		computed:{
+		computed: {
 			...mapState({
-				readUserAgreement:state=>state.user.readUserAgreement
+				readUserAgreement: state => state.user.readUserAgreement
 			})
 		},
 		onReachBottom() {
 			this.$store.commit('user/readUserAgreement', true);
 		},
+		onLoad(option) {
+			this.url=option.url
+		},
 		methods: {
 			login(e) {
-				if(!this.readUserAgreement){
+				if (!this.readUserAgreement) {
 					uni.showToast({
-						title:'请阅读完用户隐私协议再登录',
-						icon:'none'
+						title: '请阅读完用户隐私协议再登录',
+						icon: 'none'
 					})
 					return
 				}
-				this.$store.commit("user/showLoginModal", false);
-				// #ifdef MP-TOUTIAO
-				this.getUserInfo(e);
-				// #endif
-				// #ifdef MP-WEIXIN
-				this.$user.getUserProfile(e).then(res => {
-					console.log(res)
-					this.getUserInfo(res);
-				}).catch(res => {
-					console.log(res)
-				})
-				// #endif
+				uni.navigateBack()
+				// // #ifdef MP-TOUTIAO
+				// this.getUserInfo(e);
+				// // #endif
+				// // #ifdef MP-WEIXIN
+				// this.$user.getUserProfile(e).then(res => {
+				// 	console.log(res)
+				// 	this.getUserInfo(res);
+				// }).catch(res => {
+				// 	console.log(res)
+				// })
+				// // #endif
 			},
 			getUserInfo(e) {
 				// #ifdef H5
@@ -126,14 +134,15 @@
 						url: '/pages/registered/sign'
 					});
 				}
-			 // #endif
+				// #endif
 				// #ifdef MP
 				this.$store.commit('user/showLoginModal', false);
 				const resolve = this.$user.getUserInfoResolve;
 				const reject = this.$user.getUserInfoReject;
 				this.$event.on(this.$const.EVENT_USER_LOGIN, true).then(() => {
 					this.$jump({
-						open_type: 'reload'
+						open_type: 'redirect',
+						url:this.url
 					})
 				});
 				// #ifdef MP-WEIXIN
@@ -148,7 +157,7 @@
 				// #ifdef MP-ALIPAY
 				my.getOpenUserInfo({
 					success(openUserInfo) {
-			 		const response = JSON.parse(openUserInfo.response);
+						const response = JSON.parse(openUserInfo.response);
 						e.detail = {
 							rawData: JSON.stringify(response.response),
 							encryptedData: '',