From 2d02eb82474e43faedfe06910381ede0eda67f3c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 13 十月 2025 09:40:04 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai
---
small-program/pages/mine/mine.vue | 19 +++++++++++++++++--
small-program/main.js | 3 ++-
small-program/App.vue | 5 +++++
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 2 +-
4 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 7408e89..0610eea 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -210,7 +210,7 @@
request.setOutTradeNo(orders.getOutTradeNo());
request.setNotifyUrl(WxMiniConfig.wxProperties.getNotifyUrl());//杩欎釜鍥炶皟url蹇呴』鏄痟ttps寮�澶寸殑
Amount amount = new Amount();
- amount.setTotal(1);//orders.getPayAccount().intValue());
+ amount.setTotal(orders.getPayAccount().intValue());
request.setAmount(amount);
// PrepayResponse res = WxMiniConfig.wxPayService.prepay(request);
// 璺熶箣鍓嶄笅鍗曠ず渚嬩竴鏍凤紝濉厖棰勪笅鍗曞弬鏁�
diff --git a/small-program/App.vue b/small-program/App.vue
index 984b614..931fcfe 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -32,6 +32,11 @@
}
})
}
+ uni.showShareMenu({
+ withShareTicket: true,
+ menus: ['shareAppMessage', 'shareTimeline']
+ })
+
},
onShow: function() {
console.log('App Show')
diff --git a/small-program/main.js b/small-program/main.js
index 5674b6d..a7204b7 100644
--- a/small-program/main.js
+++ b/small-program/main.js
@@ -19,7 +19,8 @@
// Vue.prototype.$baseUrl = 'https://test.doumee.cn/jinkuai_web/'
Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/'
-
+import shareMixin from '@/utils/shareMixin'
+Vue.mixin(shareMixin)
const app = new Vue({
store,
...App
diff --git a/small-program/pages/mine/mine.vue b/small-program/pages/mine/mine.vue
index 7cf91be..0094782 100644
--- a/small-program/pages/mine/mine.vue
+++ b/small-program/pages/mine/mine.vue
@@ -14,7 +14,7 @@
</view>
<view class="info-box-head-info" v-if="isLogin">
<view class="info-box-head-info-name" @click="jump(1)">{{userInfo.nickName||'鍖垮悕'}}</view>
- <view class="info-box-head-info-type">
+ <view class="info-box-head-info-type" >
<view class="info-box-head-info-type-val1" v-if="userInfo.useIdentity==1">鐢ㄥ伐鎺ュ崟鏂�</view>
<view class="info-box-head-info-type-val" v-else>鐢ㄥ伐鍙戝竷鏂�</view>
<!-- <view class="info-box-head-info-type-wz" @click="editUseIdentity">鍒囨崲</view> -->
@@ -153,7 +153,8 @@
changing1:false,
autoReceiveStatus: false,
isLogin:false,
- useIdentity:0
+ useIdentity:0,
+ qrcode:''
}
},
onShow(options){
@@ -279,6 +280,20 @@
that.changing1 = false
})
} ,
+ saoyisao(){
+ var that =this
+ // 鍏佽浠庣浉鏈哄拰鐩稿唽鎵爜
+ wx.scanCode({
+ // scanType:['barCode'],
+ success (res) {
+ that.qrcode =res.result
+ console.log(res)
+ },
+ fail(e){
+ console.error(e)
+ }
+ })
+ },
updateMemberInfo(e) {
if(this.changing){
return
--
Gitblit v1.9.3