refund

libs/login.js

@@ -94,8 +94,10 @@ function _toLogin(push, pathLogin) {
 
 	// #ifdef MP
 	let url
+	console.log(BASIC_CONFIG,'BASIC_CONFIG')
 	if (!BASIC_CONFIG.wechat_auth_switch) {
-		url = '/pages/users/binding_phone/index?pageType=0'
+		// url = '/pages/users/binding_phone/index?pageType=0'
+		url = '/pages/users/wechat_login/index'
 	} else {
 		url = '/pages/users/wechat_login/index'
 	}

pages/goods/order_confirm/yuyue.vue

@@ -779,8 +779,7 @@
 							jsConfig = res.data.result.jsConfig,
 							goPages = '/pages/goods/order_pay_status/index?order_id=' + orderId + '&msg=' + res
 							.msg +
-							'&type=6' + '&totalPrice=' + this.totalPrice + '&pay_type=' + e.value +
-							'&pay_end=' + status
+							'&type=6' + '&totalPrice=' + this.totalPrice + '&pay_type=' + e.value
 						switch (status) {
 							case 'ORDER_EXIST':
 							case 'EXTEND_ORDER':
@@ -790,7 +789,7 @@
 									title: res.msg
 								}, {
 									tab: 5,
-									url: goPages
+									url: goPages + '&pay_end=error'
 								});
 								break;
 							case 'SUCCESS':
@@ -803,14 +802,14 @@
 										icon: 'success'
 									}, {
 										tab: 4,
-										url: goPages
+										url: goPages+ '&pay_end=SUCCESS'
 									});
 								return that.$util.Tips({
 									title: res.msg,
 									icon: 'success'
 								}, {
 									tab: 5,
-									url: goPages
+									url: goPages + '&pay_end=SUCCESS'
 								});
 								break;
 							case 'WECHAT_PAY':
@@ -839,14 +838,14 @@
 												icon: 'success'
 											}, {
 												tab: 4,
-												url: goPages
+												url: goPages + '&pay_end=SUCCESS'
 											});
 										return that.$util.Tips({
 											title: '支付成功',
 											icon: 'success'
 										}, {
 											tab: 5,
-											url: goPages
+											url: goPages + '&pay_end=SUCCESS'
 										});
 									},
 									fail: function(e) {
@@ -855,7 +854,7 @@
 											title: '取消支付'
 										}, {
 											tab: 5,
-											url: goPages + '&status=2'
+											url: goPages + '&status=2' + '&pay_end=error'
 										});
 									},
 									complete: function(e) {
@@ -867,7 +866,7 @@
 												title: '取消支付'
 											}, {
 												tab: 5,
-												url: goPages + '&status=2'
+												url: goPages + '&status=2' + '&pay_end=SUCCESS'
 											});
 									},
 								})
@@ -879,13 +878,13 @@
 										icon: 'success'
 									}, {
 										tab: 5,
-										url: goPages
+										url: goPages + '&pay_end=SUCCESS'
 									});
 								}).catch(res => {
 									if (!this.$wechat.isWeixin()) {
 										uni.redirectTo({
 											url: goPages +
-												'&msg=支付失败&status=2'
+												'&msg=支付失败&status=2' + '&pay_end=SUCCESS'
 										})
 									}
 									if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({

pages/goods/order_list/serve.vue

@@ -25,7 +25,7 @@
 			</view>
 			<Loading :loaded="loaded" :loading="loading"></Loading>
 			<view class="list">
-				<view class="item" v-for="(item, index) in orderList" :key="index">
+				<view class="item" v-for="(item, index) in orderList" :key="index" v-if="showOrder(item)">
 					<view @click="goOrderDetails(item.order_id)">
 						<view class="title acea-row row-between-wrapper">
 							<view class="acea-row row-middle">
@@ -182,6 +182,7 @@
 		mixins: [colors],
 		data() {
 			return {
+				userInfo: {},
 				itemList: ['不想买了', '信息填错了', '买错商品了', '卖家缺货'],
 				loaded: false,
 				loading: false, //是否加载中
@@ -242,6 +243,9 @@
 				options.status);
 		},
 		methods: {
+			showOrder(item) {
+				return item.info[0].paid != 0
+			},
 			showTime(time) {
 				var date = new Date(time * 1000);
 				var year = date.getFullYear(); // 获取年份
@@ -294,7 +298,6 @@
 			},
 			getFun() {
 				// this.getOrderData();
-				this.getOrderList();
 				this.getUserInfo();
 			},
 			onLoadFun() {
@@ -322,6 +325,8 @@
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
+					that.userInfo = res.data
+					that.getOrderList();
 					that.payMode[2].number = res.data.now_money;
 					that.$set(that, 'payMode', that.payMode);
 				});
@@ -510,6 +515,7 @@
 				that.loading = true;
 				that.loadTitle = '加载更多';
 				getServeOrder({
+						uid: that.userInfo.uid,
 						status: that.orderStatus,
 						page: that.page,
 						limit: that.limit

pages/goods/order_list/ygOrder.vue

@@ -24,7 +24,7 @@
 			</view>
 			<Loading :loaded="loaded" :loading="loading"></Loading>
 			<view class="list">
-				<view class="item" v-for="(item, index) in orderList" :key="index">
+				<view class="item" v-for="(item, index) in orderList" :key="index" v-if="showOrder(item)">
 					<view @click="goOrderDetails(item.order_id)">
 						<view class="title acea-row row-between-wrapper">
 							<view class="acea-row row-middle">
@@ -192,6 +192,9 @@
 			if (options.status) this.orderStatus = (options.status==undefined && options.status!=0)?'':parseInt(options.status);
 		},
 		methods: {
+			showOrder(item) {
+				return item.info[0].paid != 0
+			},
 			showTime(time) {
 				var date =  new Date(time*1000);
 				var year = date.getFullYear(); // 获取年份
@@ -244,7 +247,6 @@
 			},
 			getFun(){
 				// this.getOrderData();
-				this.getOrderList();
 				this.getUserInfo();
 			},
 			onLoadFun(){
@@ -272,6 +274,8 @@
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
+					that.userInfo = res.data
+					that.getOrderList();
 					that.payMode[2].number = res.data.now_money;
 					that.$set(that, 'payMode', that.payMode);
 				});
@@ -466,6 +470,7 @@
 				that.loading = true;
 				that.loadTitle = '加载更多';
 				orderSubscribe({
+						// work_member_id: 5,
 						status: that.orderStatus,
 						page: that.page,
 						limit: that.limit

pages/goods/order_pay_status/index.vue

@@ -23,7 +23,7 @@
 				</view>
 			</template>
 			<view class='wrapper'>
-				<view class='item acea-row row-between-wrapper'>
+				<view class='item acea-row row-between-wrapper' v-if="options.type != 6 || ptions.pay_end== 'SUCCESS'">
 					<view>订单编号</view>
 					<view class='itemCom'>{{orderId}}</view>
 				</view>

pages/users/wechat_login/index.vue

@@ -18,7 +18,8 @@
 		<view class="merchant-msg">
 			<img :src="configData.logo_url" />
 			<view class="name">
-				{{configData.site_name}}
+				<!-- {{configData.site_name}} -->
+				君子堂
 			</view>
 		</view>
 		<view class="wechat-login">
@@ -27,17 +28,18 @@
 				<button hover-class="none" @click="wechatLogin" class="bg-color btn1">授权登录</button>
 				<!-- #endif -->
 				<!-- #ifdef MP -->
-				<template v-if="configData.wechat_auth_switch">
-					<button hover-class="none" v-if="bindPhone" open-type="getPhoneNumber" @getphonenumber="getphonenumber"
+				<!-- <template v-if="configData.wechat_auth_switch"> -->
+					<template>
+					<button hover-class="none"  open-type="getPhoneNumber" @getphonenumber="getphonenumber"
 						class="bg-color btn1">授权登录</button>
-					<button hover-class="none" v-else-if="!bindPhone" @tap="getAuthLogin"
+					<!-- <button hover-class="none"  @tap="getAuthLogin"
 						class="bg-color btn1">授权登录</button>
-					<button hover-class="none" v-else-if="mp_is_new" @tap="userLogin"
+					<button hover-class="none"  @tap="userLogin"
 						class="bg-color btn1">授权登录</button>
-					<button v-else-if="canUseGetUserProfile && code" hover-class="none" @tap="getUserProfile"
+					<button  hover-class="none" @tap="getUserProfile"
 							class="bg-color btn1">授权登录</button>
-					<button v-else hover-class="none" open-type="getUserInfo" @getuserinfo="setUserInfo"
-						class="bg-color btn1">授权登录</button>
+					<button open-type="getUserInfo" @getuserinfo="setUserInfo"
+						class="bg-color btn1">授权登录</button> -->
 				</template>
 				<button v-if="configData.phone_auth_switch" hover-class="none" @click="phoneLogin" class="btn2">手机号登录</button>
 				<!-- #endif -->
@@ -135,7 +137,7 @@
 			privacyAgreementPopup
 		},
 		onLoad(options) {
-			this.colorData();
+			// this.colorData();
 			let loginBg = [
 				this.imgHost+'/statics/images/login-bg-1.jpg',
 				this.imgHost+'/statics/images/login-bg-2.jpg',
@@ -187,7 +189,7 @@
 			// 	.then(code => {
 			// 		this.code = code
 			// 	})
-			this.userLogin();
+			// this.userLogin();
 			// #endif
 			// #ifdef H5
 			const {