订单核销功能处理

App.vue

@@ -161,7 +161,7 @@
 			jpushModule.initJPushService()
 			jpushModule.addConnectEventListener(result => {
 				let connectEnable = result.connectEnable
-				console.log("jpush连接", connectEnable)
+				// console.log("jpush连接", connectEnable)
 			})
 
 
@@ -444,6 +444,7 @@
 	@import 'static/iconfont/iconfont.css';
 	@import 'static/iconfont/iconlihai.css';
 	@import 'static/iconfont/icontan.css';
+	@import 'static/iconfont/demo.css';
 	@import 'static/css/style.scss';
 
 

pages/admin/cancellate_result/index.vue

@@ -91,6 +91,7 @@
 	import authorize from '@/components/Authorize';
 	import emptyPage from '@/components/emptyPage.vue'
 	import { configMap } from '@/utils';
+import { navigateBack } from '../../../libs/uniApi';
 	const app = getApp();
 	export default {
 		components: {
@@ -198,6 +199,14 @@
 						that.$util.Tips({
 							title: res.message
 						});
+						if(res.status==200){
+							// uni.redirectTo({
+							// 	url:'/admin/orderList/index?types=4&merId='+that.mer_id
+							// })
+							uni.navigateBack({
+								      delta:2
+								})
+						}
 						that.getOrderData();
 					})
 					.catch(res => {

pages/admin/orderList/index.vue

@@ -293,6 +293,9 @@
 			this.merId = option.merId;
 			this.getIndex();
 		},
+		onShow(){
+			this.getIndex();
+		},
 		methods: {
 			// 关闭二维码弹窗
 			popUpClose() {

pages/admin/order_cancellation/index.vue

@@ -122,6 +122,7 @@
 			},
 			// 扫码核销			
 			scanCode() {
+			
 				var self = this;
 				// #ifdef MP || APP-PLUS
 				wx.scanCode({
@@ -129,15 +130,14 @@
 					success(res) {
 						self.verify_code = res.result
 						// console.log(self.verify_code);
+						console.log('111',self.mer_id,self.verify_code)
 						verifierOrder(self.mer_id,self.verify_code)
 							.then(res => {
-								// uni.navigateTo({
+							
-								// 	url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
-								// });
-								
 								uni.navigateTo({
-									url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
+									url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
 								});
+								
 							})
 							.catch(res => {
 								self.verify_code = ''
@@ -165,12 +165,11 @@
 						scanType: ["qrCode", "barCode"]
 					}).then(res=>{
 						this.verify_code = res.resultStr
-						// uni.navigateTo({
+						
-						// 	url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
-						// });
 						uni.navigateTo({
-							url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
+							url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
 						});
+						
 						// this.codeChange();
 					}).catch(res => {
 						this.$util.Tips({

pages/margin/margin.vue

@@ -112,23 +112,18 @@
 				merchant({
 					id: this.mer_id
 				}).then((res) => {
-
 					this.merchant_Data = res.data
 				});
 			},
 			//缴纳保证金
 			paydecimal() {
-
 				let that = this
 				uni.showModal({
 					title: '提示',
 					content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
 					success: (res) => {
 						if (res.confirm) {
-
-							// console.log('用户点击确定');
 							paymerchant().then((res) => {
-
 								uni.requestPayment({
 									provider: 'wxpay',
 									orderInfo: res.data
@@ -144,15 +139,14 @@
 										that.$util.Tips({
 											title: '支付失败'
 										});
-
 										console.log('fail:' + JSON.stringify(err));
 									}
 								});
 							}).catch((err) => {
 								console.log(err)
 								that.$util.Tips({
-											title: err
+									title: err
-										})
+								})
 							})
 						} else if (res.cancel) {
 							console.log('用户点击取消');

pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue

@@ -5,7 +5,7 @@
 					<text class="title">评论 {{all}}</text>
 					<image @click="close" class="closeBnt" src="../static/img/index/close.png" mode=""></image>
 				<view class="main">
-					<scroll-view :scroll-y="true" class="scroll-view">
+					<scroll-view :scroll-y="true" class="scroll-view"  >
 						<view v-if="list.length > 0" @touchmove="onTouchmove" id="reply"> 
 							<view class="common_list" v-for="(item, index) in list" :key="index">
 								<view class="commen_one">
@@ -18,10 +18,13 @@
 											<text class="desc">{{item.content}}</text>
 											<text class="time">{{item.create_time}}</text>
 										</view>
-										<view class="like" @click="starComment(item)">
+										
-											<image v-if="item.relevance_id" class="dianzan" src="../static/img/index/zan02.png"></image>
+										<view class="like_two" @click="starComment(item)" >
-											<image v-else class="dianzan" src="../static/img/index/zan01.png"></image>
+											<!-- <image v-if="item.relevance_id" class="dianzan" src="../static/img/index/xin.png"></image>
+											<image v-else class="dianzan" src="../static/img/index/xin-2.png"></image> -->
 											
+												<text class="iconfont":class="item.relevance_id ? 'icon-dianzan' : 'icon-dianzan1'"></text>
+												
 											<text class="like-text">{{item.count_start}}</text>
 										</view>
 									</view>
@@ -306,6 +309,7 @@
 .main_content{
 	padding: 12px 15rpx;
 	border-bottom: 2px solid #F5F5F5;
+	background-color: #e1e1e1;
 	position: relative;
 }
 .header{