From eabb18cf60273b25471509858b287474cea9b370 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 09:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into send_coupon
---
api/prize.js | 13 ++++
pages/order/myOrder.vue | 16 ++--
pages/tabbar/user/my.vue | 39 +++++++++---
pages/order/orderDetail.vue | 8 +-
pages/cart/payment/payOrder.vue | 2
pages/cart/payment/success.vue | 11 +++
pages/tabbar/index/home.vue | 67 ++++++++++++++++++----
7 files changed, 118 insertions(+), 38 deletions(-)
diff --git a/api/prize.js b/api/prize.js
index 7d9186b..32578c1 100644
--- a/api/prize.js
+++ b/api/prize.js
@@ -57,4 +57,17 @@
method: Method.POST,
needToken: true
});
+}
+/**
+ * 澧炲姞鎶藉鏈轰細
+ *
+ * @param params
+ */
+export function addPrizeNum(data) {
+ return http.request({
+ url: `/lmk/prize/addPrizeNum`,
+ method: Method.POST,
+ needToken: true,
+ data:data
+ });
}
\ No newline at end of file
diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue
index a965b8c..c032532 100644
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -160,7 +160,7 @@
paymentMethod +
"&payPrice=" +
this.cashierParams.price+
- "&orderType="+this.orderType
+ "&orderType="+this.orderType +"&orderSn="+this.cashierParams.orderSns
});
},
diff --git a/pages/cart/payment/success.vue b/pages/cart/payment/success.vue
index 46e78aa..8cada47 100644
--- a/pages/cart/payment/success.vue
+++ b/pages/cart/payment/success.vue
@@ -55,6 +55,7 @@
<script>
// import goodsRecommend from "@/pages/cart/m-goods-recommend/index.vue";
import { getSessionId, userAction } from "@/api/userAction.js";
+import {addPrizeNum} from '@/api/prize.js'
export default {
data() {
return {
@@ -123,7 +124,15 @@
this.from = options.from || "";
this.payPrice = options.payPrice || 0;
this.orderType = options.orderType;
-
+ let param = {
+ addType:"USER_BUY_ORDER_NUM",
+ extend:"",
+ }
+ let extend = {orderSn:options.orderSn}
+ param.extend = JSON.stringify(extend)
+ addPrizeNum(param);
+ param.addType = "USER_BUY_SUM_PRICE"
+ addPrizeNum(param);
},
methods: {
checkOrder() {
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 41f5961..958a642 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -177,7 +177,7 @@
</view>
<view style="display: flex;justify-content: space-around;">
<view class="" @click="callPhone">
- 瀹㈡湇鐑嚎: 028-84472936
+ 瀹㈡湇鐑嚎: 19980834650
</view>
<view class="" @click="copyToClipboard">
瀹㈡湇寰俊: meiyikuang
@@ -389,7 +389,7 @@
param.sessionId = this.pageSessionNo
userAction(param)
}
- })
+ })
if(this.$options.filters.tipsToLogin()){
if (!this.tabCurrentIndex) {
this.initData(0);
@@ -444,7 +444,7 @@
success(e) {
if(e.confirm){
uni.makePhoneCall({
- phoneNumber:'028-84472936'
+ phoneNumber:'19980834650'
})
}
}
@@ -714,14 +714,14 @@
* 鏌ョ湅鐗╂祦
*/
navigateToLogistics(order) {
+ uni.navigateTo({
+ url:
+ "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
+ });
// uni.navigateTo({
// url:
- // "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
+ // `/pages/order/deliverDetail?order_sn=${order.sn}`,
// });
- uni.navigateTo({
- url:
- `/pages/order/deliverDetail?order_sn=${order.sn}`,
- });
},
},
};
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 5d5e5cc..adcf955 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -10,7 +10,7 @@
</div>
<!-- 鐗╂祦淇℃伅 -->
<view class="info-view logistics-view">
- <view class="logistics-List" v-if="logisticsList && logisticsList.traces && logisticsList.traces.length != 0 ">
+ <view class="logistics-List" v-if="logisticsList && logisticsList.traces && logisticsList.traces.length != 0 && !(orderPackage && orderPackage.length)">
<view class="logistics-List-title">
{{ logisticsList.traces[logisticsList.traces.length - 1].AcceptStation }}
</view>
@@ -408,9 +408,9 @@
},
// 鑾峰彇鐗╂祦淇℃伅
loadLogistics(sn) {
- // getExpress(sn).then((res) => {
- // this.logisticsList = res.data.result;
- // });
+ getExpress(sn).then((res) => {
+ this.logisticsList = res.data.result;
+ });
},
// 鍒嗕韩褰撳墠鎷煎洟淇℃伅
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 8a4ae99..00fd2d7 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -265,14 +265,15 @@
import { mapState, mapMutations } from 'vuex'
import { setPopupRedisTime, getPopupAcitivty } from '@/api/popup.js'
import { changeCollect } from "@/api/collect.js";
-import { saveShare, saveShareClickRecord } from "@/api/share.js";
-import { getSessionId, userAction } from "@/api/userAction.js";
+import { saveShare, saveShareClickRecord} from "@/api/share.js";
+import { getSessionId, userAction,userShare } from "@/api/userAction.js";
import { silentLogin } from "@/api/connect.js";
import { getUserInfo } from "@/api/members";
import storage from "@/utils/storage.js";
import TopBar from "@/components/TopBar.vue";
import { nextTick } from "vue";
import { getVideoCover } from "@/api/common.js"
+import {addPrizeNum} from '@/api/prize.js'
export default {
components: { TopBar, ActivityPopup },
computed: {
@@ -371,6 +372,7 @@
similarlyLoading: false, // 鐩镐技瑙嗛鍔犺浇
marginBottom: 0 ,// 搴曢儴瀹夊叏鍖哄煙
pageSessionNo:"",
+ shareId:"",
actionParam:{
sessionId:'',
actionType:"PAGE",
@@ -379,15 +381,22 @@
pageParams:"{}",
pageStatus:"JOIN",
pageType:"LIST"
- }
+ },
+ shareParam:{
+ pageCode:"RECOMMEND_VIDEO",
+ shareOption:"{}",
+ pageType:"LIST"
+ },
}
},
onShow() {
getSessionId().then(res=>{
+ console.log('res',JSON.stringify(res))
this.pageSessionNo = res.data.data
if(this.pageSessionNo){
- let param = this.actionParam;
- param.sessionId = this.pageSessionNo
+ let param = Object.assign({},this.actionParam);
+ this.actionParam.sessionId = this.pageSessionNo
+ param.sessionId = this.pageSessionNo
userAction(param)
}
})
@@ -419,14 +428,14 @@
}
},
onUnload() {
- let param = this.actionParam;
+ let param = Object.assign({},this.actionParam);
if (this.sendOnShow)return
param.pageStatus = "LEAVE"
userAction(param)
},
onHide() {
this.startHidenTime = Date.now()
- let param = this.actionParam;
+ let param = Object.assign({},this.actionParam);
this.sendOnShow = true;
param.pageStatus = "LEAVE"
userAction(param)
@@ -503,13 +512,45 @@
// }
// })
- console.log(videoInfo)
- return {
- title: videoInfo.title,
- path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
- imageUrl: videoInfo.coverUrl
- }
// 淇濆瓨鍒嗕韩璁板綍
+
+ // 杩斿洖涓�涓狿romise
+ return new Promise((resolve) => {
+ this.shareId = '';
+ this.shareParam.shareOption = JSON.stringify({
+ id:this.activityId
+ })
+ userShare(this.shareParam).then(res => {
+ this.shareId = res.data.data;
+ let param = {
+ addType:"SHARE_GOODS_VIDEO",
+ extend:"",
+ }
+ let extend = {shareId:this.shareId}
+ param.extend = JSON.stringify(extend)
+ addPrizeNum(param);
+ // 褰撹幏鍙栧埌shareId鍚庯紝鍐峳esolve鍒嗕韩閰嶇疆
+ resolve({
+ title: videoInfo.title,
+ path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}&shareId=${this.shareId}`,
+ imageUrl: videoInfo.coverUrl,
+ success(e) {
+ console.log("鍒嗕韩鎴愬姛", e);
+ },
+ fail(e) {
+ console.log('鍒嗕韩澶辫触', e);
+ }
+ });
+ }).catch(err => {
+ // 澶勭悊閿欒鎯呭喌锛屼緥濡備娇鐢ㄩ粯璁ゅ弬鏁�
+ console.error('鑾峰彇鍒嗕韩ID澶辫触', err);
+ resolve({
+ title: videoInfo.title,
+ path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
+ imageUrl: videoInfo.coverUrl
+ });
+ });
+ });
},
methods: {
async openActivityPopup() {
diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue
index d3b8b31..f4f3e1e 100644
--- a/pages/tabbar/user/my.vue
+++ b/pages/tabbar/user/my.vue
@@ -205,17 +205,6 @@
} catch (e) {
console.error('瀛樺偍澶辫触锛�', e);
}
- }else{
- shareStoreId = uni.getStorageSync('shareStoreId');
- shareStoreId = uni.getStorageSync('shareTime');
- console.log('浠庣紦瀛樿鍙栧弬鏁�:', { shareStoreId, shareTime });
- // this.bindMemberAndStore(shareStoreId, shareTime)
- if (shareStoreId && shareTime) {
- console.log('妫�娴嬪埌鏈夋晥鍙傛暟锛岃皟鐢ㄥ悗绔帴鍙�');
- this.bindMemberAndStore(shareStoreId, shareTime);
- } else {
- console.log('鏃犳湁鏁堝弬鏁帮紝鎵ц姝ｅ父閫昏緫');
- }
}
this.initCOS()
},
@@ -246,6 +235,7 @@
userAction(param)
}
})
+
this.userInfo = this.$options.filters.isLogin() || {};
if (this.$options.filters.isLogin("auth")) {
this.getUserOrderNum();
@@ -254,6 +244,16 @@
this.couponNum = 0;
this.footNum = 0;
}
+
+ let shareStoreId = uni.getStorageSync('shareStoreId');
+ let shareTime = uni.getStorageSync('shareTime');
+ console.log('浠庣紦瀛樿鍙栧弬鏁�:', { shareStoreId, shareTime });
+ if (shareStoreId && shareTime) {
+ console.log('妫�娴嬪埌鏈夋晥鍙傛暟锛岃皟鐢ㄥ悗绔帴鍙�');
+ this.bindMemberAndStore(shareStoreId, shareTime);
+ } else {
+ console.log('鏃犳湁鏁堝弬鏁帮紝鎵ц姝ｅ父閫昏緫');
+ }
},
onPullDownRefresh() {
this.getUserOrderNum();
@@ -270,6 +270,23 @@
mounted() { },
methods: {
+ // 瑙ｆ瀽URL鍙傛暟
+ parseUrlParams(url) {
+ const params = {};
+ // 澶勭悊鍙兘瀛樺湪鐨刪ash锛堝鏋滄湁鐨勮瘽锛�
+ const cleanUrl = url.split('#')[0];
+ const queryStr = cleanUrl.split('?')[1] || '';
+
+ queryStr.split('&').forEach(pair => {
+ const [key, value] = pair.split('=');
+ if (key) {
+ // 濡傛灉鍊煎瓨鍦紝鍒欒В鐮侊紝鍚﹀垯璁句负绌哄瓧绗︿覆
+ params[key] = value ? decodeURIComponent(value) : '';
+ }
+ });
+
+ return params;
+ },
async bindMemberAndStore(shareStoreId, shareTime){
let form ={
shareStoreId: shareStoreId,
--
Gitblit v1.8.0