Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-sp

* 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-sp:
  移除高速快讯查询404接口调用
  修改按钮权限配置 & 处理缓存IsLogin导致登陆提示失效

App.vue

@@ -25,6 +25,8 @@
 
 		onLaunch: function(option) {
 			var that = this;
+			// 每次进入小程序时，重置IsLogin的状态
+			setItem("IsLogin", false);
 			uni.getSystemInfo({
 				success: (res) => {
 					if (res.uniPlatform === 'mp-weixin') {

pages/index/index.vue

@@ -531,20 +531,20 @@
 		};
 
 		//调用方式
-		requestNew(queryHighMsg, options).then((res) => {
-			console.log("高速快讯查询接口", res);
-			state.highMsgData = res.result.slice(0, 4)
-			for (var i = 0; i < state.highMsgData.length; i++) {
-				state.highMsgData[i]["copywriting"] = getCodeName('COPYWRITING', state.highMsgData[i]["copywriting"])
-				state.highMsgData[i]["updateTime"] = state.highMsgData[i]["updateTime"].replace('T', ' ')
-				if (state.highMsgData[i]["type"] == 3) {
-					state.highMsgData[i]["title"] = state.highMsgData[i]["hyperLink"]
-				}
-			}
-			state.highMsgData.sort(function (a, b) {
-				return a.sequence - b.sequence//正序
-			})
-		}).catch((err) => { console.log(err) });
+		// requestNew(queryHighMsg, options).then((res) => {
+		// 	console.log("高速快讯查询接口", res);
+		// 	state.highMsgData = res.result.slice(0, 4)
+		// 	for (var i = 0; i < state.highMsgData.length; i++) {
+		// 		state.highMsgData[i]["copywriting"] = getCodeName('COPYWRITING', state.highMsgData[i]["copywriting"])
+		// 		state.highMsgData[i]["updateTime"] = state.highMsgData[i]["updateTime"].replace('T', ' ')
+		// 		if (state.highMsgData[i]["type"] == 3) {
+		// 			state.highMsgData[i]["title"] = state.highMsgData[i]["hyperLink"]
+		// 		}
+		// 	}
+		// 	state.highMsgData.sort(function (a, b) {
+		// 		return a.sequence - b.sequence//正序
+		// 	})
+		// }).catch((err) => { console.log(err) });
 	}
 
 	const processeCondition = () => {

pages/order/components/order-list-item-new.vue

@@ -51,30 +51,34 @@
 					v-if="item.amount">{{item.amount / 100}}</text><text class="amount" v-else>0.00</text></view>
 		</view>
 
-		<view class="btns" v-if="item.orderStep == 'WAITING_ACTIVE'">
-			<view class="btn btn-normal" @click.stop="gotoReturnOrder(item)" v-if="item.shippingStatus == 'RECEIVED'">申请退货</view>
-			<view class="btn btn-normal" @click.stop="gotoExchangeOrder(item)" v-if="item.shippingStatus == 'RECEIVED'">申请换货</view>
+		<!-- <view class="btns" v-if="item.orderStep == 'WAITING_ACTIVE'"> -->
+			
 	<!-- 		<view class="btn btn-normal" @click.stop="gotoReplenishmentOrder(item)"
 				v-if="item.deviceType == deviceType">
 				申请补货</view> -->
-			<view class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
+		<!-- 	<view class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view> -->
 			<!-- <view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view> -->
-		</view>
+		<!-- </view> -->
 
 		<view v-if="item.orderStatus == 'NORMAL'">
-			<view class="btns">
-				<view v-if="item.orderStep=='ORDER_INIT'||item.orderStep=='CUSTOMER_UPLOAD'" class="btn btn-primary"
-					@click.stop="gotoEditUserOrUnitInfo(item)">继续申请</view>
-				<view v-if="item.orderStep=='VEHICLE_UPLOAD'" class="btn btn-primary"
-					@click.stop="gotoOrderDetailsPay(item)">支付</view>
-				<!-- <view v-if="item.orderStep=='WAITING_ACTIVE'" class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view> -->
-				<view v-if="item.orderStep=='WAITING_RECEIVE'&&item.shippingStatus=='WAIT_RECEIVING'"
-					class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货</view>
-				<view v-if="item.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoOrderSign(item)">签约
+			<view v-if="item.orderSource !== 'APP'">
+				<view class="btns">
+					<view v-if="(item.orderSource == 'WECHAT') && (item.orderStep=='ORDER_INIT'||item.orderStep=='CUSTOMER_UPLOAD')" class="btn btn-primary"
+						@click.stop="gotoEditUserOrUnitInfo(item)">继续申请</view>
+					<view v-if="item.orderStep=='VEHICLE_UPLOAD'" class="btn btn-primary"
+						@click.stop="gotoOrderDetailsPay(item)">支付</view>
+					<view v-if="item.orderStep=='WAITING_ACTIVE'" class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
+					<view v-if="item.orderSource == 'WECHAT' && item.orderStep=='WAITING_ACTIVE' && item.shippingStatus == 'RECEIVED'" class="btn btn-normal" @click.stop="gotoReturnOrder(item)">申请退货</view>
+					<view v-if="item.orderSource == 'WECHAT' && item.orderStep=='WAITING_ACTIVE' && item.shippingStatus == 'RECEIVED'" class="btn btn-normal" @click.stop="gotoExchangeOrder(item)">申请换货</view>
+					<view v-if="item.orderSource == 'WECHAT' && item.orderStep=='WAITING_RECEIVE' && item.shippingStatus=='WAIT_RECEIVING'"
+						class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货</view>
+					<view v-if="item.orderSource == 'WECHAT' && item.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(item)">去评价产品</view>
+					<view v-if="item.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoOrderSign(item)">签约
+					</view>
+					<view
+						v-if="(item.orderSource == 'WECHAT') && (item.orderStep=='ORDER_INIT'||item.orderStep=='CUSTOMER_UPLOAD'||item.orderStep=='VEHICLE_UPLOAD'||item.orderStep=='ORDER_PAID'||item.orderStep=='ORDER_SIGNED'||item.orderStep=='WAITING_AUDIT'||item.orderStep=='AUDIT_FAIL'||item.orderStep=='WAITING_SEND')"
+						class="btn btn-primary" @click.stop="gotoCancelOrder(item)">取消订单</view>
 				</view>
-				<view
-					v-if="item.orderStep=='ORDER_INIT'||item.orderStep=='CUSTOMER_UPLOAD'||item.orderStep=='VEHICLE_UPLOAD'||item.orderStep=='ORDER_PAID'||item.orderStep=='ORDER_SIGNED'||item.orderStep=='WAITING_AUDIT'||item.orderStep=='AUDIT_FAIL'||item.orderStep=='WAITING_SEND'"
-					class="btn btn-primary" @click.stop="gotoCancelOrder(item)">取消订单</view>
 			</view>
 		</view>
 	</view>

subpackage/orders/moreHighMsg/moreHighMsg.vue

@@ -59,19 +59,19 @@
 		};
 
 		//调用方式
-		requestNew(queryHighMsg, options).then((res) => {
-			console.log("高速快讯查询接口", res.data);
-			state.highMsgData = [...res.result, ...state.highMsgData]
-			console.log("state.highMsgData", state.highMsgData)
-			for (var i = 0; i < state.highMsgData.length; i++) {
-				state.highMsgData[i]["copywriting"] = getCodeName('COPYWRITING', state.highMsgData[i]["copywriting"])
-			}
-			state.highMsgData.sort(function (a, b) {
-			  return a.sequence - b.sequence//正序
-			})
-		})
-			.catch((err) => {
-			});
+		// requestNew(queryHighMsg, options).then((res) => {
+		// 	console.log("高速快讯查询接口", res.data);
+		// 	state.highMsgData = [...res.result, ...state.highMsgData]
+		// 	console.log("state.highMsgData", state.highMsgData)
+		// 	for (var i = 0; i < state.highMsgData.length; i++) {
+		// 		state.highMsgData[i]["copywriting"] = getCodeName('COPYWRITING', state.highMsgData[i]["copywriting"])
+		// 	}
+		// 	state.highMsgData.sort(function (a, b) {
+		// 	  return a.sequence - b.sequence//正序
+		// 	})
+		// })
+		// 	.catch((err) => {
+		// 	});
 	}
 	const link = (item) => {
 		if (item.type == 1) {