bug修改

.env.development

@@ -10,4 +10,4 @@ VITE_APP_BASE_API = ''
 # 路由懒加载
 VITE_CLI_BABEL_TRANSPILE_MODULES = true
 
-VITE_API_URL=http://test-coupon.qiuyutech.com.cn/stage-api
+VITE_API_URL=http://192.168.168.104:8090

dist/build/mp-weixin/pagesOne/record/winnerList.js

@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),t=require("../../services/ams.js"),s=e.defineComponent({__name:"winnerList",setup(s){const a=e.index.getStorageSync("openid"),n=e.index.getStorageSync("appid"),o=e.ref([]),c=()=>{t.auditSuccessList({openid:a}).then((e=>{o.value=e.rows}))};return e.onLoad((()=>{c()})),(s,a)=>({a:e.f(o.value,((s,a,o)=>e.e({a:0===a},{},{b:e.t(s.title),c:e.t(s.discountLevel),d:e.t(s.paymentAmount||0),e:e.t(s.startTime),f:e.t(s.endTime),g:e.n("3"===s.processStatus||"5"===s.processStatus||"6"===s.processStatus?"active":"static"),h:e.o((a=>{var o;("3"===(o=s).processStatus||"5"===o.processStatus||"6"===o.processStatus)&&t.payment(o.id).then((t=>{500!==t.code?e.wx$1.canIUse("requestMerchantTransfer")?e.wx$1.requestMerchantTransfer({mchId:t.data.merchantId,appId:n,package:t.data.packageInfo,success:t=>{e.index.showToast({icon:"success",title:"请求成功"}),c()},fail:t=>{e.index.showToast({icon:"none",title:"提现申请失败"})}}):e.wx$1.showModal({content:"你的微信版本过低，请更新至最新版本。",showCancel:!1}):e.index.showToast({icon:"none",title:"提现申请失败"})})).catch((t=>{e.index.showToast({icon:"none",title:t.msg})}))}),s.id),i:s.id})))})}}),a=e._export_sfc(s,[["__scopeId","data-v-27c76baf"]]);wx.createPage(a);
+"use strict";const e=require("../../common/vendor.js"),t=require("../../services/ams.js"),s=e.defineComponent({__name:"winnerList",setup(s){const n=e.index.getStorageSync("openid"),a=e.index.getStorageSync("appid"),o=e.ref([]),c=e=>"3"===e||"5"===e||"6"===e;return e.onLoad((()=>{t.auditSuccessList({openid:n}).then((e=>{o.value=e.rows}))})),(s,n)=>({a:e.f(o.value,((s,n,o)=>e.e({a:0===n},{},{b:e.t(s.title),c:e.t(s.discountLevel),d:e.t(s.paymentAmount||0),e:e.t(s.startTime),f:e.t(s.endTime),g:e.t(c(s.processStatus)?"提现":"提现成功"),h:e.n(c(s.processStatus)?"active":"static"),i:e.o((n=>{var o;("3"===(o=s).processStatus||"5"===o.processStatus||"6"===o.processStatus)&&t.payment(o.id).then((t=>{500!==t.code?e.wx$1.canIUse("requestMerchantTransfer")?e.wx$1.requestMerchantTransfer({mchId:t.data.merchantId,appId:a,package:t.data.packageInfo,success:t=>{e.index.showToast({icon:"success",title:"请求成功"}),setTimeout((()=>{e.index.switchTab({url:"/pages/my/index"})}),500)},fail:t=>{e.index.showToast({icon:"none",title:"提现申请失败"})}}):e.wx$1.showModal({content:"你的微信版本过低，请更新至最新版本。",showCancel:!1}):e.index.showToast({icon:"none",title:"提现申请失败"})})).catch((t=>{e.index.showToast({icon:"none",title:t.msg})}))}),s.id),j:s.id})))})}}),n=e._export_sfc(s,[["__scopeId","data-v-cc640405"]]);wx.createPage(n);

dist/build/mp-weixin/pagesOne/record/winnerList.wxml

@@ -1 +1 @@
-<view class="winnerListContent data-v-27c76baf"><view class="title data-v-27c76baf">奖励记录</view><view class="content data-v-27c76baf"><view wx:for="{{a}}" wx:for-item="item" wx:key="i" class="activityItem data-v-27c76baf"><view class="top flex-start-center data-v-27c76baf"><image wx:if="{{item.a}}" class="now data-v-27c76baf" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/nowAct.png" mode="scaleToFill"/><image wx:else class="old data-v-27c76baf" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/act.png" mode="scaleToFill"/><text class="name data-v-27c76baf">{{item.b}}</text></view><view class="data-v-27c76baf"><text class="data-v-27c76baf">活动力度：{{item.c}}</text><text class="data-v-27c76baf" style="margin-left:44rpx"> 奖励金额：{{item.d}}元 </text></view><view class="data-v-27c76baf"> 活动时间：{{item.e}}至{{item.f}}</view><view class="flex-end data-v-27c76baf"><view class="{{['widthBtn', 'data-v-27c76baf', item.g]}}" bindtap="{{item.h}}">提现</view></view></view></view></view>
+<view class="winnerListContent data-v-cc640405"><view class="title data-v-cc640405">奖励记录</view><view class="content data-v-cc640405"><view wx:for="{{a}}" wx:for-item="item" wx:key="j" class="activityItem data-v-cc640405"><view class="top flex-start-center data-v-cc640405"><image wx:if="{{item.a}}" class="now data-v-cc640405" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/nowAct.png" mode="scaleToFill"/><image wx:else class="old data-v-cc640405" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/act.png" mode="scaleToFill"/><text class="name data-v-cc640405">{{item.b}}</text></view><view class="data-v-cc640405"><text class="data-v-cc640405">活动力度：{{item.c}}</text><text class="data-v-cc640405" style="margin-left:44rpx"> 奖励金额：{{item.d}}元 </text></view><view class="data-v-cc640405"> 活动时间：{{item.e}}至{{item.f}}</view><view class="flex-end data-v-cc640405"><view class="{{['widthBtn', 'data-v-cc640405', item.h]}}" bindtap="{{item.i}}">{{item.g}}</view></view></view></view></view>

dist/build/mp-weixin/pagesOne/record/winnerList.wxss

@@ -1 +1 @@
-.winnerListContent.data-v-27c76baf{padding:32rpx;box-sizing:border-box;background:#f7f8f9;min-height:100vh}.winnerListContent .title.data-v-27c76baf{color:#000;font-weight:700;font-size:32rpx;position:relative;margin-left:16rpx}.winnerListContent .title.data-v-27c76baf:before{content:" ";display:inline-block;width:6rpx;height:30rpx;background-color:#296041;margin-right:16rpx;position:absolute;border-radius:200rpx;left:-16rpx;top:0;bottom:0;margin:auto}.winnerListContent .content .activityItem.data-v-27c76baf{color:#666;font-size:28rpx;padding:24rpx;box-shadow:0 4rpx 16rpx rgba(207,223,232,.12);background:#fff;margin-top:16rpx;border-radius:16rpx}.winnerListContent .content .activityItem.data-v-27c76baf:first-of-type{position:relative}.winnerListContent .content .activityItem.data-v-27c76baf:first-of-type:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border:2rpx solid;border-radius:inherit;padding:2rpx;box-sizing:border-box;background:linear-gradient(90deg,#225036,#3b8e5e 45.92%,#3d8f5f);-webkit-mask:linear-gradient(#fff 0 0) content-box,linear-gradient(#fff 0 0);-webkit-mask-composite:destination-out;mask-composite:exclude}.winnerListContent .content .activityItem>view.data-v-27c76baf{margin-top:16rpx}.winnerListContent .content .activityItem .now.data-v-27c76baf{width:110rpx;height:34rpx}.winnerListContent .content .activityItem .old.data-v-27c76baf{width:60rpx;height:34rpx}.winnerListContent .content .activityItem .name.data-v-27c76baf{font-weight:700;color:#333;margin-left:16rpx}.winnerListContent .content .activityItem .top.data-v-27c76baf{margin-top:0}.winnerListContent .widthBtn.data-v-27c76baf{width:128rpx;border-radius:82rpx;background:linear-gradient(90deg,#225036,#3b8e5e 45.92%,#3d8f5f);color:#fff;line-height:48rpx;text-align:center;position:relative;z-index:999}.winnerListContent .widthBtn.static.data-v-27c76baf{background:#d1d1d6}
+.winnerListContent.data-v-cc640405{padding:32rpx;box-sizing:border-box;background:#f7f8f9;min-height:100vh}.winnerListContent .title.data-v-cc640405{color:#000;font-weight:700;font-size:32rpx;position:relative;margin-left:16rpx}.winnerListContent .title.data-v-cc640405:before{content:" ";display:inline-block;width:6rpx;height:30rpx;background-color:#296041;margin-right:16rpx;position:absolute;border-radius:200rpx;left:-16rpx;top:0;bottom:0;margin:auto}.winnerListContent .content .activityItem.data-v-cc640405{color:#666;font-size:28rpx;padding:24rpx;box-shadow:0 4rpx 16rpx rgba(207,223,232,.12);background:#fff;margin-top:16rpx;border-radius:16rpx}.winnerListContent .content .activityItem.data-v-cc640405:first-of-type{position:relative}.winnerListContent .content .activityItem.data-v-cc640405:first-of-type:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border:2rpx solid;border-radius:inherit;padding:2rpx;box-sizing:border-box;background:linear-gradient(90deg,#225036,#3b8e5e 45.92%,#3d8f5f);-webkit-mask:linear-gradient(#fff 0 0) content-box,linear-gradient(#fff 0 0);-webkit-mask-composite:destination-out;mask-composite:exclude}.winnerListContent .content .activityItem>view.data-v-cc640405{margin-top:16rpx}.winnerListContent .content .activityItem .now.data-v-cc640405{width:110rpx;height:34rpx}.winnerListContent .content .activityItem .old.data-v-cc640405{width:60rpx;height:34rpx}.winnerListContent .content .activityItem .name.data-v-cc640405{font-weight:700;color:#333;margin-left:16rpx}.winnerListContent .content .activityItem .top.data-v-cc640405{margin-top:0}.winnerListContent .widthBtn.data-v-cc640405{width:128rpx;border-radius:82rpx;background:linear-gradient(90deg,#225036,#3b8e5e 45.92%,#3d8f5f);color:#fff;line-height:48rpx;text-align:center;position:relative;z-index:999}.winnerListContent .widthBtn.static.data-v-cc640405{background:#d1d1d6}

dist/build/mp-weixin/pagesOne/winner/components/activityDescPopup.js

@@ -1 +1 @@
-"use strict";const e=require("../../../common/vendor.js"),o=require("../../../hooks/useDraw.js");if(!Array){e.resolveComponent("wd-popup")()}Math;const s=e.defineComponent({__name:"activityDescPopup",props:{show:{type:Boolean,default:!1}},emits:["update:show"],setup(s,{emit:t}){const r=s,a=t,{handleClose:p}=o.useDraw(r,a);return(o,s)=>({a:e.o(e.unref(p)),b:e.o((e=>r.show=e)),c:e.p({position:"bottom",closable:!0,"custom-style":"height: 600rpx;border-radius:16rpx",modelValue:r.show})})}}),t=e._export_sfc(s,[["__scopeId","data-v-ba555c8a"]]);wx.createComponent(t);
+"use strict";const e=require("../../../common/vendor.js"),o=require("../../../hooks/useDraw.js");if(!Array){e.resolveComponent("wd-popup")()}Math;const t=e.defineComponent({__name:"activityDescPopup",props:{show:{type:Boolean,default:!1},description:{type:String,default:""}},emits:["update:show"],setup(t,{emit:s}){const r=t,p=s,{handleClose:n}=o.useDraw(r,p);return(o,s)=>({a:e.t(t.description),b:e.o(e.unref(n)),c:e.o((e=>r.show=e)),d:e.p({position:"bottom",closable:!0,"custom-style":"height: 600rpx;border-radius:16rpx",modelValue:r.show})})}}),s=e._export_sfc(t,[["__scopeId","data-v-9876310f"]]);wx.createComponent(s);

dist/build/mp-weixin/pagesOne/winner/components/activityDescPopup.wxml

@@ -1 +1 @@
-<view class="activityDescPopup data-v-ba555c8a"><wd-popup wx:if="{{c}}" class="data-v-ba555c8a" u-s="{{['d']}}" bindclose="{{a}}" u-i="ba555c8a-0" bind:__l="__l" bindupdateModelValue="{{b}}" u-p="{{c}}"><view class="title data-v-ba555c8a">活动说明</view><view class="content data-v-ba555c8a"> 1.购买今麦郎指定商品，满25元返5元红包，满20元返2元红包，满12元返3元红包，满38元返10元红包;<view class="data-v-ba555c8a"/> 2.活动期间每个用户享受2次满额返红包机会;<view class="data-v-ba555c8a"/> 3.活动仅限指定城市门店参与以线下门店物料为准;<view class="data-v-ba555c8a"/> 本活动最终解释权归今麦郎品牌所有 </view></wd-popup></view>
+<view class="activityDescPopup data-v-9876310f"><wd-popup wx:if="{{d}}" class="data-v-9876310f" u-s="{{['d']}}" bindclose="{{b}}" u-i="9876310f-0" bind:__l="__l" bindupdateModelValue="{{c}}" u-p="{{d}}"><view class="title data-v-9876310f">活动说明</view><view class="content data-v-9876310f">{{a}}</view></wd-popup></view>

dist/build/mp-weixin/pagesOne/winner/components/activityDescPopup.wxss

@@ -1 +1 @@
-.activityDescPopup .title.data-v-ba555c8a{font-size:32rpx;color:#333;font-weight:700;text-align:center;margin-top:32rpx}.activityDescPopup .content.data-v-ba555c8a{font-size:24rpx;color:#666;width:90%;margin:50rpx auto;line-height:34rpx}
+.activityDescPopup .title.data-v-9876310f{font-size:32rpx;color:#333;font-weight:700;text-align:center;margin-top:32rpx}.activityDescPopup .content.data-v-9876310f{font-size:24rpx;color:#666;width:90%;margin:50rpx auto;line-height:34rpx}

dist/build/mp-weixin/pagesOne/winner/components/uploadReceptPopop.js

@@ -1 +1 @@
-"use strict";const e=require("../../../common/vendor.js"),o=require("../utils/source.js"),t=require("../../../hooks/useDraw.js"),n=require("../../../services/ams.js");if(!Array){(e.resolveComponent("wd-gap")+e.resolveComponent("wd-popup"))()}Math||((()=>"../../../node-modules/wot-design-uni/components/wd-gap/wd-gap.js")+(()=>"../../../node-modules/wot-design-uni/components/wd-popup/wd-popup.js"))();const s=e.defineComponent({__name:"uploadReceptPopop",props:{show:{type:Boolean,default:!1},id:{type:String,defalut:""},list:Array},emits:["update:show"],setup(s,{emit:i}){const a=s,d=e.index.getStorageSync("openid"),r=i;e.ref("1");const u=o=>{if(!p.value)return e.index.showToast({title:"请先选择优惠力度",icon:"none"});const t={openid:d,marketingActivityId:a.id,discountId:p.value};n.validate(t).then((o=>{o.valid?e.index.navigateTo({url:`/pagesOne/winner/uploadImage?discountId=${p.value}&discountLevel=${c.value}`}):e.index.showToast({title:"该活动力度次数您已经用完啦，换一个活动力度参与吧",icon:"none"})})).catch((o=>{e.index.showToast({title:o.msg,icon:"none"})})),r("update:show",!1)},p=e.ref(""),c=e.ref(""),l=e=>{p.value=e.detail.value;const o=a.list.filter((o=>o.id===e.detail.value))[0];c.value=`满${o.thresholdAmount}返${o.cashbackAmount}`},{handleClose:m}=t.useDraw(a,r);return(t,n)=>({a:e.f(a.list,((o,t,n)=>({a:e.t(o.thresholdAmount),b:e.t(o.cashbackAmount),c:o.id,d:o.checked,e:o.id,f:e.n(o.checked?"active":"static")}))),b:e.unref(o.imgObj).icon1,c:e.o(l),d:e.o(u),e:e.p({height:"16rpx","bg-color":"#F7F8F9"}),f:e.o(((...o)=>e.unref(m)&&e.unref(m)(...o))),g:e.o(e.unref(m)),h:e.o((e=>a.show=e)),i:e.p({position:"bottom","safe-area-inset-bottom":!0,"custom-style":"max-height: 922rpx;border-radius: 40rpx 40rpx 0 0;",modelValue:a.show})})}});wx.createComponent(s);
+"use strict";const e=require("../../../common/vendor.js"),o=require("../utils/source.js"),t=require("../../../hooks/useDraw.js"),n=require("../../../services/ams.js");if(!Array){(e.resolveComponent("wd-gap")+e.resolveComponent("wd-popup"))()}Math||((()=>"../../../node-modules/wot-design-uni/components/wd-gap/wd-gap.js")+(()=>"../../../node-modules/wot-design-uni/components/wd-popup/wd-popup.js"))();const s=e.defineComponent({__name:"uploadReceptPopop",props:{show:{type:Boolean,default:!1},id:{type:String,defalut:""},list:Array},emits:["update:show"],setup(s,{emit:i}){const a=s,r=e.index.getStorageSync("openid"),d=i;e.ref("1");const u=o=>{if(!p.value)return e.index.showToast({title:"请先选择优惠力度",icon:"error"});const t={openid:r,marketingActivityId:a.id,discountId:p.value};n.validate(t).then((o=>{o.valid?e.index.navigateTo({url:`/pagesOne/winner/uploadImage?discountId=${p.value}&discountLevel=${c.value}`}):e.index.showToast({title:"该活动力度次数您已经用完啦，换一个活动力度参与吧",icon:"none"})})).catch((o=>{e.index.showToast({title:o.msg,icon:"none"})})),d("update:show",!1)},p=e.ref(""),c=e.ref(""),l=e=>{p.value=e.detail.value;const o=a.list.filter((o=>o.id===e.detail.value))[0];c.value=`满${o.thresholdAmount}返${o.cashbackAmount}`},{handleClose:m}=t.useDraw(a,d);return(t,n)=>({a:e.f(a.list,((o,t,n)=>({a:e.t(o.thresholdAmount),b:e.t(o.cashbackAmount),c:o.id,d:o.checked,e:o.id,f:e.n(o.checked?"active":"static")}))),b:e.unref(o.imgObj).icon1,c:e.o(l),d:e.o(u),e:e.p({height:"16rpx","bg-color":"#F7F8F9"}),f:e.o(((...o)=>e.unref(m)&&e.unref(m)(...o))),g:e.o(e.unref(m)),h:e.o((e=>a.show=e)),i:e.p({position:"bottom","safe-area-inset-bottom":!0,"custom-style":"max-height: 922rpx;border-radius: 40rpx 40rpx 0 0;",modelValue:a.show})})}});wx.createComponent(s);

dist/build/mp-weixin/pagesOne/winner/components/uploadReceptPopop.wxss

@@ -1 +1 @@
-.uploadReceptPopup .topTitle{font-size:36rpx;color:#1f1f39;height:80rpx;text-align:center;margin-top:26rpx}.uploadReceptPopup .topTitle .tips{font-size:20rpx;color:#bfc8db}.uploadReceptPopup .receptBox{max-height:350rpx;overflow-y:scroll}.uploadReceptPopup .radioItem{display:flex;justify-content:space-between;align-items:center;padding:0 60rpx;height:80rpx;box-sizing:border-box;color:#333;font-size:28rpx}.uploadReceptPopup .radioItem .left{display:flex;align-items:center}.uploadReceptPopup .radioItem .icon{width:36rpx;height:36rpx;margin-right:20rpx}.uploadReceptPopup .radioItem.active{background-color:#f7f8f9}.uploadReceptPopup .radioItem.static{background-color:#fff}.uploadReceptPopup .radioItem:focus{background-color:pink}.uploadReceptPopup .btnBox{font-size:36rpx;color:#555d6c;margin-top:48rpx}.uploadReceptPopup .btnBox>view{text-align:center;width:100%;line-height:108rpx}.uploadReceptPopup .btnBox .play{background:#f7f8f9}
+.uploadReceptPopup .topTitle{font-size:36rpx;color:#1f1f39;height:80rpx;text-align:center;margin-top:26rpx}.uploadReceptPopup .topTitle .tips{font-size:20rpx;color:#bfc8db}.uploadReceptPopup .receptBox{max-height:350rpx;overflow-y:scroll}.uploadReceptPopup .radioItem{display:flex;justify-content:space-between;align-items:center;padding:0 60rpx;height:80rpx;box-sizing:border-box;color:#333;font-size:32rpx}.uploadReceptPopup .radioItem .left{display:flex;align-items:center}.uploadReceptPopup .radioItem .icon{width:36rpx;height:36rpx;margin-right:20rpx}.uploadReceptPopup .radioItem.active{background-color:#f7f8f9}.uploadReceptPopup .radioItem.static{background-color:#fff}.uploadReceptPopup .radioItem:focus{background-color:pink}.uploadReceptPopup .btnBox{font-size:36rpx;color:#555d6c;margin-top:48rpx}.uploadReceptPopup .btnBox>view{text-align:center;width:100%;line-height:108rpx}.uploadReceptPopup .btnBox .play{background:#f7f8f9}

dist/dev/mp-weixin/pages/index/index.js

@@ -20,7 +20,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       common_vendor.index.login({
         //获取code，
         success: (res) => {
-          services_ams.getOpenId(res.code).then((res2) => {
+          const params = {
+            code: res.code,
+            appid: common_vendor.index.getAccountInfoSync().miniProgram.appId
+          };
+          services_ams.getOpenId(params).then((res2) => {
             if (res2.code === 200) {
               common_vendor.index.setStorageSync("openid", res2.data.openid);
             } else {
@@ -41,6 +45,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     };
     const loginRef = common_vendor.ref(null);
     const toActivity = () => {
+      const data = JSON.parse(common_vendor.index.getStorageSync("activityData")) || {};
+      if (!data) {
+        common_vendor.index.showToast({
+          title: "当前暂无满返红包上传小票活动哦",
+          icon: "none"
+        });
+        return;
+      }
       if (!utils_system.isGetPhone()) {
         loginRef.value.show = true;
       } else {

dist/dev/mp-weixin/pagesOne/record/winnerList.js

@@ -28,7 +28,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             package: res.data.packageInfo,
             success: (response) => {
               common_vendor.index.showToast({ icon: "success", title: "请求成功" });
-              getList();
+              setTimeout(() => {
+                common_vendor.index.switchTab({
+                  url: "/pages/my/index"
+                });
+              }, 500);
             },
             fail: (response) => {
               common_vendor.index.showToast({ icon: "none", title: "提现申请失败" });
@@ -44,6 +48,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         common_vendor.index.showToast({ icon: "none", title: err.msg });
       });
     };
+    const isWithDraw = (status) => {
+      return status === "3" || status === "5" || status === "6";
+    };
     common_vendor.onLoad(() => {
       getList();
     });
@@ -58,9 +65,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             d: common_vendor.t(item.paymentAmount || 0),
             e: common_vendor.t(item.startTime),
             f: common_vendor.t(item.endTime),
-            g: common_vendor.n(item.processStatus === "3" || item.processStatus === "5" || item.processStatus === "6" ? "active" : "static"),
-            h: common_vendor.o(($event) => onPayment(item), item.id),
-            i: item.id
+            g: common_vendor.t(isWithDraw(item.processStatus) ? "提现" : "提现成功"),
+            h: common_vendor.n(isWithDraw(item.processStatus) ? "active" : "static"),
+            i: common_vendor.o(($event) => onPayment(item), item.id),
+            j: item.id
           });
         })
       };

dist/dev/mp-weixin/pagesOne/record/winnerList.wxml

@@ -1 +1 @@
-<view class="winnerListContent data-v-1f9f7d73"><view class="title data-v-1f9f7d73">奖励记录</view><view class="content data-v-1f9f7d73"><view wx:for="{{a}}" wx:for-item="item" wx:key="i" class="activityItem data-v-1f9f7d73"><view class="top flex-start-center data-v-1f9f7d73"><image wx:if="{{item.a}}" class="now data-v-1f9f7d73" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/nowAct.png" mode="scaleToFill"/><image wx:else class="old data-v-1f9f7d73" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/act.png" mode="scaleToFill"/><text class="name data-v-1f9f7d73">{{item.b}}</text></view><view class="data-v-1f9f7d73"><text class="data-v-1f9f7d73">活动力度：{{item.c}}</text><text class="data-v-1f9f7d73" style="margin-left:44rpx"> 奖励金额：{{item.d}}元 </text></view><view class="data-v-1f9f7d73"> 活动时间：{{item.e}}至{{item.f}}</view><view class="flex-end data-v-1f9f7d73"><view class="{{['widthBtn', 'data-v-1f9f7d73', item.g]}}" bindtap="{{item.h}}">提现</view></view></view></view></view>
+<view class="winnerListContent data-v-1f9f7d73"><view class="title data-v-1f9f7d73">奖励记录</view><view class="content data-v-1f9f7d73"><view wx:for="{{a}}" wx:for-item="item" wx:key="j" class="activityItem data-v-1f9f7d73"><view class="top flex-start-center data-v-1f9f7d73"><image wx:if="{{item.a}}" class="now data-v-1f9f7d73" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/nowAct.png" mode="scaleToFill"/><image wx:else class="old data-v-1f9f7d73" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/act.png" mode="scaleToFill"/><text class="name data-v-1f9f7d73">{{item.b}}</text></view><view class="data-v-1f9f7d73"><text class="data-v-1f9f7d73">活动力度：{{item.c}}</text><text class="data-v-1f9f7d73" style="margin-left:44rpx"> 奖励金额：{{item.d}}元 </text></view><view class="data-v-1f9f7d73"> 活动时间：{{item.e}}至{{item.f}}</view><view class="flex-end data-v-1f9f7d73"><view class="{{['widthBtn', 'data-v-1f9f7d73', item.h]}}" bindtap="{{item.i}}">{{item.g}}</view></view></view></view></view>

dist/dev/mp-weixin/pagesOne/winner/components/activityDescPopup.js

@@ -15,6 +15,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     show: {
       type: Boolean,
       default: false
+    },
+    description: {
+      type: String,
+      default: ""
     }
   },
   emits: ["update:show"],
@@ -24,9 +28,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const { handleClose } = hooks_useDraw.useDraw(props, emit);
     return (_ctx, _cache) => {
       return {
-        a: common_vendor.o(common_vendor.unref(handleClose)),
-        b: common_vendor.o(($event) => props.show = $event),
-        c: common_vendor.p({
+        a: common_vendor.t(__props.description),
+        b: common_vendor.o(common_vendor.unref(handleClose)),
+        c: common_vendor.o(($event) => props.show = $event),
+        d: common_vendor.p({
           position: "bottom",
           closable: true,
           ["custom-style"]: "height: 600rpx;border-radius:16rpx",

dist/dev/mp-weixin/pagesOne/winner/components/activityDescPopup.wxml

@@ -1 +1 @@
-<view class="activityDescPopup data-v-84dcedc1"><wd-popup wx:if="{{c}}" class="data-v-84dcedc1" u-s="{{['d']}}" bindclose="{{a}}" u-i="84dcedc1-0" bind:__l="__l" bindupdateModelValue="{{b}}" u-p="{{c}}"><view class="title data-v-84dcedc1">活动说明</view><view class="content data-v-84dcedc1"> 1.购买今麦郎指定商品，满25元返5元红包，满20元返2元红包，满12元返3元红包，满38元返10元红包;<view class="data-v-84dcedc1"/> 2.活动期间每个用户享受2次满额返红包机会;<view class="data-v-84dcedc1"/> 3.活动仅限指定城市门店参与以线下门店物料为准;<view class="data-v-84dcedc1"/> 本活动最终解释权归今麦郎品牌所有 </view></wd-popup></view>
+<view class="activityDescPopup data-v-84dcedc1"><wd-popup wx:if="{{d}}" class="data-v-84dcedc1" u-s="{{['d']}}" bindclose="{{b}}" u-i="84dcedc1-0" bind:__l="__l" bindupdateModelValue="{{c}}" u-p="{{d}}"><view class="title data-v-84dcedc1">活动说明</view><view class="content data-v-84dcedc1">{{a}}</view></wd-popup></view>

dist/dev/mp-weixin/pagesOne/winner/components/uploadReceptPopop.js

@@ -36,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       if (!discountId.value)
         return common_vendor.index.showToast({
           title: "请先选择优惠力度",
-          icon: "none"
+          icon: "error"
         });
       const params = {
         openid,

dist/dev/mp-weixin/pagesOne/winner/components/uploadReceptPopop.wxss

@@ -46,7 +46,7 @@
   height: 80rpx;
   box-sizing: border-box;
   color: #333;
-  font-size: 28rpx;
+  font-size: 32rpx;
 }
 .uploadReceptPopup .radioItem .left {
   display: flex;

dist/dev/mp-weixin/pagesOne/winner/index.js

@@ -140,6 +140,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         }),
         D: common_vendor.o(($event) => common_vendor.isRef(showDesc) ? showDesc.value = $event : showDesc = $event),
         E: common_vendor.p({
+          description: common_vendor.unref(aData).description,
           show: common_vendor.unref(showDesc)
         })
       };

dist/dev/mp-weixin/pagesOne/winner/uploadImage.js

@@ -18,7 +18,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const openid = common_vendor.index.getStorageSync("openid");
     const phone = common_vendor.index.getStorageSync("phone");
     const routerInfo = common_vendor.reactive({ discountId: "", discountLevel: "" });
-    const action = "http://test-coupon.qiuyutech.com.cn/stage-api/miniApp/oss/upload/" + aData.brandId;
+    const action = "http://192.168.168.104:8090/miniApp/oss/upload/" + aData.brandId;
     const customUpload = (file, formData, options) => {
       common_vendor.index.uploadFile({
         url: action,

dist/dev/mp-weixin/services/ams.js

@@ -44,8 +44,7 @@ const rewardDetail = (data) => {
 const getPhoneNumberInfo = (data) => {
   return utils_http.http({
     method: "GET",
-    url: `/miniApp/getPhoneNumber/${data}`,
-    data
+    url: `/miniApp/getPhoneNumber/${data.appid}/${data.code}`
   });
 };
 const validate = (data) => {
@@ -58,7 +57,7 @@ const validate = (data) => {
 const getOpenId = (data) => {
   return utils_http.http({
     method: "GET",
-    url: `/miniApp/getOpenId/${data}`,
+    url: `/miniApp/getOpenId/${data.appid}/${data.code}`,
     data
   });
 };

dist/dev/mp-weixin/utils/http.js

@@ -1,6 +1,6 @@
 "use strict";
 const common_vendor = require("../common/vendor.js");
-const baseURL = "http://test-coupon.qiuyutech.com.cn/stage-api";
+const baseURL = "http://192.168.168.104:8090";
 const httpInterceptor = {
   // 拦截前触发
   invoke(options) {

dist/dev/mp-weixin/utils/system.js

@@ -31,7 +31,12 @@ const getActivityData = () => {
   return isAuth;
 };
 const getMobile = async (code, path) => {
-  const res = await services_ams.getPhoneNumberInfo(code);
+  const appid = common_vendor.index.getStorageSync("appid");
+  const params = {
+    code,
+    appid
+  };
+  const res = await services_ams.getPhoneNumberInfo(params);
   try {
     if (res.code === 200) {
       common_vendor.index.setStorageSync("phone", res.data);

src/pages/index/index.vue

@@ -46,7 +46,11 @@ const onLogin = () => {
   uni.login({
     //获取code，
     success: (res) => {
-      getOpenId(res.code).then((res: any) => {
+      const params = {
+        code: res.code,
+        appid: uni.getAccountInfoSync().miniProgram.appId,
+      };
+      getOpenId(params).then((res: any) => {
         if (res.code === 200) {
           uni.setStorageSync("openid", res.data.openid);
         } else {
@@ -69,6 +73,15 @@ const getBanner = () => {
 
 const loginRef = <any>ref(null);
 const toActivity = () => {
+  const data = JSON.parse(uni.getStorageSync("activityData")) || {};
+  if (!data) {
+    uni.showToast({
+      title: "当前暂无满返红包上传小票活动哦",
+      icon: "none",
+    });
+    return;
+  }
+
   if (!isGetPhone()) {
     loginRef.value.show = true;
   } else {

src/pagesOne/record/winnerList.vue

@@ -29,15 +29,9 @@
         <view class="flex-end">
           <view
             class="widthBtn"
-            :class="
-              item.processStatus === '3' ||
-              item.processStatus === '5' ||
-              item.processStatus === '6'
-                ? 'active'
-                : 'static'
-            "
+            :class="isWithDraw(item.processStatus) ? 'active' : 'static'"
             @click="onPayment(item)"
-            >提现</view
+            >{{ isWithDraw(item.processStatus) ? "提现" : "提现成功" }}</view
           >
         </view>
       </view>
@@ -78,7 +72,13 @@ const onPayment = (data: any) => {
           package: res.data.packageInfo,
           success: (response: any) => {
             uni.showToast({ icon: "success", title: "请求成功" });
-            getList();
+            // getList();
+            setTimeout(() => {
+              uni.switchTab({
+                url: "/pages/my/index",
+              });
+            }, 500);
+
             // res.err_msg将在页面展示成功后返回应用时返回ok，并不代表付款成功
             // console.log("success:", res);
           },
@@ -98,6 +98,10 @@ const onPayment = (data: any) => {
     });
 };
 
+const isWithDraw = (status: string) => {
+  return status === "3" || status === "5" || status === "6";
+};
+
 onLoad(() => {
   getList();
 });

src/pagesOne/winner/components/activityDescPopup.vue

@@ -9,10 +9,7 @@
     >
       <view class="title">活动说明</view>
       <view class="content">
-        1.购买今麦郎指定商品，满25元返5元红包，满20元返2元红包，满12元返3元红包，满38元返10元红包;<br />
-        2.活动期间每个用户享受2次满额返红包机会;<br />
-        3.活动仅限指定城市门店参与以线下门店物料为准;<br />
-        本活动最终解释权归今麦郎品牌所有
+        {{ description }}
       </view>
     </wd-popup>
   </view>
@@ -26,6 +23,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  description: {
+    type: String,
+    default: "",
+  },
 });
 
 const emit = defineEmits(["update:show"]);

src/pagesOne/winner/components/uploadReceptPopop.vue

@@ -72,7 +72,7 @@ const toUploadImage = (type: string) => {
   if (!discountId.value)
     return uni.showToast({
       title: "请先选择优惠力度",
-      icon: "none",
+      icon: "error",
     });
   const params = {
     openid,
@@ -140,7 +140,7 @@ const { handleClose } = useDraw(props, emit);
     height: 80rpx;
     box-sizing: border-box;
     color: #333;
-    font-size: 28rpx;
+    font-size: 32rpx;
     .left {
       display: flex;
       align-items: center;

src/pagesOne/winner/index.vue

@@ -82,7 +82,10 @@
       v-model:show="showRecord"
       :list="rewardData"
     ></upload-record-popup>
-    <activity-desc-popup v-model:show="showDesc"></activity-desc-popup>
+    <activity-desc-popup
+      v-model:show="showDesc"
+      :description="aData.description"
+    ></activity-desc-popup>
   </view>
 </template>
 

src/services/ams.ts

@@ -63,8 +63,7 @@ export const rewardDetail = (data: any) => {
 export const getPhoneNumberInfo = (data: any) => {
   return http({
     method: "GET",
-    url: `/miniApp/getPhoneNumber/${data}`,
-    data,
+    url: `/miniApp/getPhoneNumber/${data.appid}/${data.code}`,
   });
 };
 
@@ -89,7 +88,7 @@ export const validate = (data: any) => {
 export const getOpenId = (data: any) => {
   return http({
     method: "GET",
-    url: `/miniApp/getOpenId/${data}`,
+    url: `/miniApp/getOpenId/${data.appid}/${data.code}`,
     data,
   });
 };

src/utils/system.ts

@@ -56,7 +56,12 @@ export const getActivityData = () => {
 };
 
 export const getMobile = async (code: string, path: string) => {
-  const res: any = await getPhoneNumberInfo(code);
+  const appid = uni.getStorageSync("appid");
+  const params = {
+    code,
+    appid,
+  };
+  const res: any = await getPhoneNumberInfo(params);
   try {
     if (res.code === 200) {
       uni.setStorageSync("phone", res.data);