lhl 1 year ago
parent
commit
815dca691e

+ 2 - 2
access/common.js

@@ -89,13 +89,13 @@ export function getEnToken() {
 	// return 'b8ca10e4ce35fded735c980403dfedf7' //master
 	// #ifdef MP
 	// const entoken = uni.getExtConfigSync().token || ''
-	return "931544405107da76ca2ec31cd63fae49"
+	return "3bef1eab4692142cfe373956646e6f70"
 	// return "fa4c7dee4c8c37d41204a9c1e11f3e43"
 	// return entoken
 	// #endif
 	// #ifdef H5||APP-PLUS
 	// return "fa4c7dee4c8c37d41204a9c1e11f3e43"
-	return "931544405107da76ca2ec31cd63fae49"
+	return "3bef1eab4692142cfe373956646e6f70"
 	// #endif
 }
 // 获取openid

+ 10 - 8
pages/user/user.vue

@@ -172,12 +172,12 @@
 					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-vip-' + theme + '.png'"></image></view>
 					<view class="fn-label">会员卡</view>
 				</view> -->
-				<view class="fn-li" @click="navTo('/pagesT/user/dyquan')">
+				<!-- <view class="fn-li" @click="navTo('/pagesT/user/dyquan')">
 					<view class="fn-icon">
 						<image src="https://api.junhailan.com/img/user/dyq.png"></image>
 					</view>
 					<view class="fn-label">我的抵用券</view>
-				</view>
+				</view> -->
 				<view class="fn-li" @click="navTo('/pagesT/address/address')">
 					<view class="fn-icon">
 						<image src="https://api.junhailan.com/img/user/wddz.png"></image>
@@ -190,10 +190,10 @@
 					</view>
 					<view class="fn-label">我的优惠卡</view>
 				</view>
-				<!-- 	<view class="fn-li" @click="goDistribution">
+					<view class="fn-li" @click="goDistribution">
 					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-fen-' + theme + '.png'"></image></view>
 					<view class="fn-label">分销中心</view>
-				</view> -->
+				</view>
 				<view class="fn-li" @click="navTo('/pagesT/user/Collection')">
 					<view class="fn-icon">
 						<image src="https://api.junhailan.com/img/user/wdsc.png"></image>
@@ -529,11 +529,13 @@
 					});
 					//#endif
 				} else {
-					if (this.distributionSet.level && this.distributionSet.level > 0) {
 						this.getInfoBusinessman();
-					} else {
-						this.$api.msg('抱歉,当前商家暂未开启分销功能');
-					}
+					// console.log(this.distributionSet.level,'this.distributionSet.level');
+					// if (this.distributionSet.level && this.distributionSet.level > 0) {
+					// 	this.getInfoBusinessman();
+					// } else {
+					// 	this.$api.msg('抱歉,当前商家暂未开启分销功能');
+					// }
 				}
 			},
 			// 获取文字设置

+ 2 - 1
pagesT/Distribution/ApplyTerm.vue

@@ -138,7 +138,8 @@ export default {
 		},
 		async subApply() {
 			let params = {
-				customerId: this.customerId
+				customerId: this.customerId,
+				auditStatus: 1
 			};
 			if (this.distributionSet.businessmanCondition === 1) {
 				let isSub = true;

+ 2 - 2
pagesT/order/orderDetail.vue

@@ -189,7 +189,7 @@
 									</block>
 									<text class="price primary-color" v-else>¥{{ it.price }}</text>
 								</view>
-								<view class="float_right" v-if="order_detail.orderStatus === 5">
+								<!-- <view class="float_right" v-if="order_detail.orderStatus === 5">
 									<u-button
 										v-if="it.returnStatus === 0"
 										@click="goPage(`/pagesT/order/ReturnSales?orderId=${order_id}&goodsId=${it.goodsId}&skuId=${it.skuId}`)"
@@ -199,7 +199,7 @@
 										售后
 									</u-button>
 									<u-button v-else @click="goPage(`/pagesT/order/ReturnOrder`)" size="mini" plain>{{ it.returnStatus === 1 ? '售后中' : '已售后' }}</u-button>
-								</view>
+								</view> -->
 							</view>
 						</view>
 					</view>

+ 2 - 3
pagesT/order/orderT.vue

@@ -14,8 +14,7 @@
 					<scroll-view @scrolltolower="scrollBootom" scroll-y="true" style="height:100%">
 						<u-empty v-if="tabItem.list.length == 0" mode="list"></u-empty>
 						<view v-for="(item, index) in tabItem.list" :key="index" class="order-item">
-							<view class="clearfix order-no-view"
-								@click="goPage(`/pagesT/order/orderDetail?id=` + item.id)">
+							<view class="clearfix order-no-view">
 								<text class="float_left order-no-text">{{ $_utils.formatDate(item.createTime) }}</text>
 								<text class="float_right order-status-text">
 									{{
@@ -57,7 +56,7 @@
 									取消预约
 								</view>
 								<view class="btnSAdd float_right primary-btn" @click="goPage('/pagesT/unit/evaluate?uid=' + item.uid + '&order_id=' + item.id)"
-									v-if="item.status == 1 && item.is_evaluate == 0">
+									v-if="item.status == 1 && !item.is_evaluate">
 									去评价
 								</view>
 								<!-- #endif -->