From a7b2a673a931ddd2cbbb9e86433428411f3b3850 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Mon, 2 Feb 2026 17:44:10 +0800 Subject: [PATCH] =?UTF-8?q?2.2=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 + api/api.js | 12 +- api/goods_api.js | 14 +- components/MyHtml2canvas.vue | 94 ++ components/dialog/dialog.vue | 6 +- components/empty/empty.vue | 8 +- components/plv-player-skin/skin.nvue | 1480 +++++++++---------- manifest.json | 34 +- pages.json | 23 +- pages/loading/loading.vue | 23 +- pages/my/my.vue | 2 +- pages/patientClass/patientClass.vue | 2 +- pages/upload/upload.nvue | 299 ++++ pages/upload/upload.vue | 119 -- pages_app/buyPoint/buyPoint.vue | 16 +- pages_app/buyUpan/address.vue | 68 +- pages_app/buyUpan/buyUpan.vue | 42 +- pages_app/hot/hot.vue | 11 +- pages_app/myCode/myCode.vue | 706 ++++++++- pages_app/myPoint/myPoint.vue | 53 +- pages_app/myWelfare/myWelfare.vue | 213 ++- pages_app/myWelfare/welfareDetail.vue | 13 +- pages_app/myWelfareCard/exchange.vue | 81 +- pages_app/myWelfareCard/myWelfareCard.vue | 250 +++- pages_app/patientVideo/patientVideo.vue | 25 +- pages_app/pointMall/pointMall.vue | 2 - pages_app/ppt/ppt.vue | 54 +- pages_app/pptDetail/pptDetail.vue | 23 +- pages_app/pptDownload/pptDownload.vue | 10 + pages_app/video/video.vue | 2 +- pages_app/videoDetail/videoDetail.vue | 78 +- pages_app/webview/webview.vue | 5 +- pages_app/zhinanDownload/zhinanDownload.vue | 26 +- pages_app/zhinanList/zhinanList.vue | 11 +- pages_chat/article/article.vue | 2 +- pages_chat/searchArticle/searchArticle.vue | 2 +- pages_goods/exchange/address.vue | 75 +- pages_goods/exchange/exchangeDetail.vue | 437 ++++++ pages_goods/exchange/index.vue | 38 +- pages_goods/logistics/logistics.vue | 348 +++++ pages_goods/myRedemption/myRedemption.vue | 70 +- pages_goods/pointMall/pointMall.vue | 66 +- pages_goods/productDetail/productDetail.vue | 63 +- static/myjifen_big-1.png | Bin 0 -> 89350 bytes static/myjifen_big.png | Bin 89350 -> 32236 bytes static/play.png | Bin 0 -> 1357 bytes static/reward.png | Bin 0 -> 178792 bytes static/right_selsect_big.png | Bin 0 -> 1235 bytes tsconfig.json | 8 + utils/config.js | 4 +- utils/docUrl.js | 4 +- utils/otherHost.js | 4 +- utils/request.js | 2 +- utils/version.js | 2 +- 54 files changed, 3615 insertions(+), 1317 deletions(-) create mode 100644 components/MyHtml2canvas.vue create mode 100644 pages/upload/upload.nvue delete mode 100644 pages/upload/upload.vue create mode 100644 pages_goods/exchange/exchangeDetail.vue create mode 100644 pages_goods/logistics/logistics.vue create mode 100644 static/myjifen_big-1.png create mode 100644 static/play.png create mode 100644 static/reward.png create mode 100644 static/right_selsect_big.png diff --git a/App.vue b/App.vue index 92f0e3e..f56ee42 100644 --- a/App.vue +++ b/App.vue @@ -67,6 +67,8 @@ export default { uni.$emit('paySuccess',{ type:'GandanFile', }); + }else if(data.type=='BuyPoint'){ + uni.navigateBack(); } } }); diff --git a/api/api.js b/api/api.js index a2610a8..e594ffe 100644 --- a/api/api.js +++ b/api/api.js @@ -120,11 +120,11 @@ const api = { }, // 积分支付列表 bonusPointsPayList(data) { - return request('/expertAPI/bonusPointsPayList', data, 'post', false); + return request('/expertAPI/bonusPointsPayList', data, 'post', true); }, // 积分列表 bonusPointsList(data) { - return request('/expertAPI/bonusPointsList', data, 'post', false); + return request('/expertAPI/bonusPointsList', data, 'post', true); }, getWelfarePage(data) { @@ -673,9 +673,7 @@ const api = { welfareList(data){ return request('/expertAPI/welfareList', data, 'post', false); }, - getUGoods(data){ - return request('/expertApp/getUGoods', data, 'post', false); - }, + getUGoods(data){ return request('/expertAPI/getGoodsDetailU', data, 'post', false); }, @@ -688,6 +686,10 @@ const api = { createBointsOrder(data){ return request('/expertPay/createBointsOrder', data, 'post', false); }, + receiveWelfare(data){ + return request('/expertAPI/receiveWelfare', data, 'post', false); + }, + } diff --git a/api/goods_api.js b/api/goods_api.js index 436d2af..aa20e53 100644 --- a/api/goods_api.js +++ b/api/goods_api.js @@ -28,8 +28,20 @@ const goods_api = { }, getGoodsOrderList(data) { return request('/expertAPI/goodsOrderList', data, 'post', true); + }, + getUpanWelfareCount(data){ + return request('/expertAPI/getUpanWelfareCount', data, 'post', false); + }, + getGoodsOrderDetail(data) { + return request('/expertAPI/getGoodsOrder', data, 'post', true); + }, + getOrderTrack(data) { + return request('/expertAPI/getOrderTrack', data, 'post', true); + }, + cancelGoodsOrder(data) { + return request('/expertAPI/cancleGoodsOrder', data, 'post', true); } - + } export default goods_api; \ No newline at end of file diff --git a/components/MyHtml2canvas.vue b/components/MyHtml2canvas.vue new file mode 100644 index 0000000..7ea9a5c --- /dev/null +++ b/components/MyHtml2canvas.vue @@ -0,0 +1,94 @@ + + + + + + + + + diff --git a/components/dialog/dialog.vue b/components/dialog/dialog.vue index 524d58f..bb9c07e 100644 --- a/components/dialog/dialog.vue +++ b/components/dialog/dialog.vue @@ -3,7 +3,7 @@ - {{ title }} + {{ title }} @@ -63,6 +63,10 @@ type: Boolean, default: false }, + titleColor: { + type: String, + default: '#8B2316' + }, title: { type: String, default: '温馨提示' diff --git a/components/empty/empty.vue b/components/empty/empty.vue index af50838..44da94e 100644 --- a/components/empty/empty.vue +++ b/components/empty/empty.vue @@ -1,7 +1,7 @@ @@ -9,6 +9,12 @@ import { ref } from 'vue'; import { onShow } from "@dcloudio/uni-app"; import emptyImg from "@/static/icon_empty.png" + const props = defineProps({ + emptyDesc: { + type: String, + default: '暂无数据' + } + }) \ No newline at end of file diff --git a/pages/upload/upload.vue b/pages/upload/upload.vue deleted file mode 100644 index b036a06..0000000 --- a/pages/upload/upload.vue +++ /dev/null @@ -1,119 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages_app/buyPoint/buyPoint.vue b/pages_app/buyPoint/buyPoint.vue index de33a8f..d7875da 100644 --- a/pages_app/buyPoint/buyPoint.vue +++ b/pages_app/buyPoint/buyPoint.vue @@ -63,6 +63,8 @@ import navBar from '@/components/navBar/navBar.vue'; const freeVisible = ref(false); const freeContent = ref('您确定是否购买?'); + const product_id = ref(''); + const type = ref(''); const freeClose = () => { freeVisible.value = false; }; @@ -72,18 +74,30 @@ point: selectedPackageData.value.points }).then(res => { if(res.code==200){ + console.log('price:'+res.data.amount); + console.log('order_id:'+res.data.order_id); + console.log('trade_no:'+res.data.trade_no); + console.log('jifen:'+res.data.point); uni.sendNativeEvent('payPonitPage', { msg: { "price":res.data.amount, "order_id":res.data.order_id, "trade_no":res.data.trade_no, 'jifen':res.data.point, + 'product_id':product_id.value, + 'type':type.value, }, }); } }); }; - onLoad(() => { + onLoad((options) => { + if(options.product_id){ + product_id.value = options.product_id; + } + if(options.type){ + type.value = options.type; + } getPointUnitPrice(); }); const pointUnitPrice = ref(1); diff --git a/pages_app/buyUpan/address.vue b/pages_app/buyUpan/address.vue index 287815d..67a6674 100644 --- a/pages_app/buyUpan/address.vue +++ b/pages_app/buyUpan/address.vue @@ -20,7 +20,7 @@ 邮箱 --> - + 地址 @@ -34,6 +34,7 @@ 详细地址 + @@ -63,28 +64,29 @@