From 0d7a893e599c79b69cf37dcfd1ab507377fc2e87 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 28 Sep 2023 17:18:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A0=B8=E9=94=80=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 3 ++-
pages/admin/cancellate_result/index.vue | 9 +++++++++
pages/admin/orderList/index.vue | 3 +++
pages/admin/order_cancellation/index.vue | 17 ++++++++---------
pages/margin/margin.vue | 10 ++--------
.../douyin-scrollview/douyin-scrollview.nvue | 12 ++++++++----
pages/short_video/components/index/zan01.png | Bin 944 -> 0 bytes
pages/short_video/components/index/zan02.png | Bin 747 -> 0 bytes
8 files changed, 32 insertions(+), 22 deletions(-)
delete mode 100644 pages/short_video/components/index/zan01.png
delete mode 100644 pages/short_video/components/index/zan02.png
diff --git a/App.vue b/App.vue
index 5129746..b26bfb7 100644
--- a/App.vue
+++ b/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';
diff --git a/pages/admin/cancellate_result/index.vue b/pages/admin/cancellate_result/index.vue
index 2614b9e..62c966e 100644
--- a/pages/admin/cancellate_result/index.vue
+++ b/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 => {
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 399c417..4879d0d 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -293,6 +293,9 @@
this.merId = option.merId;
this.getIndex();
},
+ onShow(){
+ this.getIndex();
+ },
methods: {
// 关闭二维码弹窗
popUpClose() {
diff --git a/pages/admin/order_cancellation/index.vue b/pages/admin/order_cancellation/index.vue
index 9a3d94d..7aec653 100644
--- a/pages/admin/order_cancellation/index.vue
+++ b/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({
diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index 3f728d6..90c4392 100644
--- a/pages/margin/margin.vue
+++ b/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('用户点击取消');
diff --git a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
index b918f45..886c8fe 100644
--- a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
+++ b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
@@ -5,7 +5,7 @@
评论 {{all}}
-
+
@@ -18,10 +18,13 @@
{{item.content}}
{{item.create_time}}
-
-
-
+
+
+
+
+
{{item.count_start}}
@@ -306,6 +309,7 @@
.main_content{
padding: 12px 15rpx;
border-bottom: 2px solid #F5F5F5;
+ background-color: #e1e1e1;
position: relative;
}
.header{
diff --git a/pages/short_video/components/index/zan01.png b/pages/short_video/components/index/zan01.png
deleted file mode 100644
index dba7d6488482be3eff0bc64d530497657978ba5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 944
zcmV;h15f;kP)@Fj1)r#hl1;&iiivHS
z_&ZGF6ym&)bxIq|UCgm*2#Q9-zq&Yc^^$Hmb}g6fjW$Qvhb0w_z~
zV_N4(ad?_cCZA}f1kk*l>JpNGF|XIVB^r%RX#)a`RVx1`%OqDIk9COw<&0BKY++%c
zq#cCDVzG;MS$MLKIZmP8P|LYoZl&;TITee=&s23-2eByWztcSl&jdx3ss}v&_KO|$m%!>L*xPWU|e`v@O@yb
z$)>K?B5FJ$=r!4=A(Uq@8Ui?2RSMY&w#Oz*;PVV=t=il`AaJ=*D5x{8jR^1-UOsCv
zsFwt~Ti=sq;KFPKpJ~g9>F&nqVOvf(Y^JXV?K&BwqodDTc4BH9bf0Q^OzxKejgAge
zGq`U(V)x&57tp>4^a^>s#^?$EO0K)RJ01>)|7g4!ZP*fRT$LmQf5u*$@*zk0j^y+C
zA}{%_W(l<3H4z79AC;ew4tzdeL_2V4GGMnv=0&leRBhr&9TU+>g!6J+Ja`ZWM@B|I
z*}W;CPh=8)wd0L=c_@n*_#KR1u#tm2oZsqo_`CsISC6~MufezK7g;Lb?)Uqr^=U%c
z&z?-XIJX2dnd5YSoz6cvj;^IBEf|qNT>(s&bTkp&?5NiBxYLP-B@vyq{RmYHY)-fy
z+pr4pm4m_H{f>3S*p5m$baO8fi4@ekB>;+^`T6-D!pq_muE}IFKNqFu|5B-B;)89sdG{&{AfC
Sd;-M)0000HvnB=Z@k7yy;TdAc};c<}BGwapiH
z6qtL{n6qQYAv-RIt|!7BCL+^Wv?eTY+F~fr%F5w**nhzj{sjT7Dk@fXu8tlmF0P4+
zLYlrB9zOHCn}Zq(RDQSJw0*W|_KkGET`An>-|VUUT=x7~4a1&AowrPLzaIK(utS*H
z*0JGc*3Tm%>sn2{HarQxIeT%puiulaQudZBb=?x*+CGoJSkwOcL&>VhUBCQT+toUg
zs;4K42=4P1a!K4UCGUoz&Z_ISOjgOSmp-4GQ=7L=G%@?rm7{svKYKE4tmVHT|01-_
zv`%I1QLP;-Ht5^NjD}v--~-PW`|rXybE`hdt0&
zdQ$z94<1`S{tkD0XV!9|?A?~$l!_Mbot|C?WAcPFW}Wq2RhOyvOzq`usZ0OM@-iwi
zLMG3-dAV_Jwl2@KO0#1s=UDz;|GnqcW7|2=cPIT&n5}sv|AdMEwZC<)0S8n6XBY32
z&pZD6Tc7K)O)fqYCDz?Oy6Mk6r;9EHQ(fay1x?!)Tw{OAac;fqg=gFNy%$t;-{))G
zb->)q#b$kp=l=Gi+!rIHAGw{sCaUY^@w8U((ej^#@hu_`+HJ)jiJPvIS+VDKvEsk7
zJxARh`)i3DzkBi8vuiJv*ct(FI+I8RqUmvv4FO#s9fJ>LKT