接口联调

.env.development

@@ -10,4 +10,4 @@ VITE_APP_BASE_API = ''
 # 路由懒加载
 VITE_CLI_BABEL_TRANSPILE_MODULES = true
 
-VITE_API_URL=http://192.168.168.104:8090
+VITE_API_URL=http://192.168.168.71:8080

.env.production

@@ -6,4 +6,4 @@ VITE_NODE_ENV = production
 # 若依管理系统/生产环境
 VITE_APP_BASE_API = '/prod-api'
 
-VITE_API_URL=https://shuzhi.qiuyutech.com.cn/prod-api
+VITE_API_URL=https://coupon.qiuyutech.com.cn/prod-api

.env.staging

@@ -8,4 +8,4 @@ VITE_ENV = 'staging'
 # 若依管理系统/测试环境
 VITE_APP_BASE_API = '/stage-api'
 
-VITE_API_URL=https://shuzhi.qiuyutech.com.cn/prod-api
+VITE_API_URL=https://test-coupon.qiuyutech.com.cn/stage-api

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

@@ -16,9 +16,16 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   setup(__props) {
     const current = common_vendor.ref(0);
     const appid = common_vendor.index.getStorageSync("appid");
-    common_vendor.onLoad(() => {
-      getBanner();
-    });
+    const onLogin = () => {
+      common_vendor.index.login({
+        //获取code，
+        success: (res) => {
+          services_ams.getOpenId(res.code).then((res2) => {
+            common_vendor.index.setStorageSync("openid", res2.data.openid);
+          });
+        }
+      });
+    };
     const bannerList = common_vendor.ref([]);
     const getBanner = () => {
       services_ams.getCarousel(appid).then((res) => {
@@ -35,6 +42,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         });
       }
     };
+    common_vendor.onLoad(() => {
+      onLogin();
+      getBanner();
+    });
     common_vendor.onShow(() => {
       utils_system.getActivityData();
     });

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

@@ -11,6 +11,20 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         list.value = res.rows;
       });
     };
+    const onPayment = (data) => {
+      if (data.processStatus != "3")
+        return;
+      services_ams.payment(data.id).then((res) => {
+        if (res.code === 200) {
+          common_vendor.index.showToast({ icon: "success", title: "提现成功" });
+        } else {
+          common_vendor.index.showToast({ icon: "none", title: "提现失败" });
+        }
+        getList();
+      }).catch((err) => {
+        common_vendor.index.showToast({ icon: "none", title: err.msg });
+      });
+    };
     common_vendor.onLoad(() => {
       getList();
     });
@@ -26,7 +40,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             e: common_vendor.t(item.startTime),
             f: common_vendor.t(item.endTime),
             g: common_vendor.n(item.processStatus === "3" ? "active" : "static"),
-            h: item.id
+            h: common_vendor.o(($event) => onPayment(item), item.id),
+            i: 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="h" 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">奖励金额：{{item.d}}元</text></view><view class="data-v-1f9f7d73"> 活动时间：{{item.e}}至{{item.f}}</view><view class="{{['widthBtn', 'data-v-1f9f7d73', item.g]}}">提现</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="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">奖励金额：{{item.d}}元</text></view><view class="data-v-1f9f7d73"> 活动时间：{{item.e}}至{{item.f}}</view><view class="{{['widthBtn', 'data-v-1f9f7d73', item.g]}}" bindtap="{{item.h}}">提现</view></view></view></view>

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

@@ -106,6 +106,8 @@
   color: #fff;
   line-height: 48rpx;
   text-align: center;
+  position: relative;
+  z-index: 999;
 }
 .winnerListContent .widthBtn.static.data-v-1f9f7d73 {
   background: #d1d1d6;

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

@@ -44,10 +44,22 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         discountId: discountId.value
       };
       services_ams.validate(params).then((res) => {
-        console.log("验证次数", res);
-      });
-      common_vendor.index.navigateTo({
-        url: `/pagesOne/winner/uploadImage?discountId=${discountId.value}&discountLevel=${discountLevel.value}`
+        if (res.valid) {
+          common_vendor.index.navigateTo({
+            url: `/pagesOne/winner/uploadImage?discountId=${discountId.value}&discountLevel=${discountLevel.value}`
+          });
+          return;
+        }
+        common_vendor.index.showToast({
+          title: "该活动力度次数您已经用完啦，换一个活动力度参与吧",
+          icon: "none"
+        });
+        return;
+      }).catch((err) => {
+        common_vendor.index.showToast({
+          title: err.msg,
+          icon: "none"
+        });
       });
       emit("update:show", false);
     };

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://192.168.168.104:8090/miniApp/oss/upload/" + aData.brandId;
+    const action = "http://192.168.168.71:8080/miniApp/oss/upload/" + aData.brandId;
     const customUpload = (file, formData, options) => {
       common_vendor.index.uploadFile({
         url: action,

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

@@ -52,17 +52,30 @@ const validate = (data) => {
   return utils_http.http({
     method: "POST",
     url: `/miniApp/validate/${data.marketingActivityId}`,
-    data: {
-      openid: data.openid,
-      discountId: data.discountId
-    }
+    data
+  });
+};
+const getOpenId = (data) => {
+  return utils_http.http({
+    method: "GET",
+    url: `/miniApp/getOpenId/${data}`,
+    data
+  });
+};
+const payment = (data) => {
+  return utils_http.http({
+    method: "POST",
+    url: `/customer/payment/${data}`,
+    data
   });
 };
 exports.addCustomer = addCustomer;
 exports.auditSuccessList = auditSuccessList;
 exports.getActivity = getActivity;
 exports.getCarousel = getCarousel;
+exports.getOpenId = getOpenId;
 exports.getPhoneNumberInfo = getPhoneNumberInfo;
+exports.payment = payment;
 exports.rewardDetail = rewardDetail;
 exports.rewardList = rewardList;
 exports.validate = validate;

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

@@ -1,6 +1,6 @@
 "use strict";
 const common_vendor = require("../common/vendor.js");
-const baseURL = "http://192.168.168.104:8090";
+const baseURL = "http://192.168.168.71:8080";
 const httpInterceptor = {
   // 拦截前触发
   invoke(options) {

src/pages/index/index.vue

@@ -33,7 +33,7 @@
 
 <script setup lang="ts">
 import { onLoad, onShow } from "@dcloudio/uni-app";
-import { getCarousel } from "@/services/ams";
+import { getCarousel, getOpenId } from "@/services/ams";
 import { ref } from "vue";
 // import { useInfoStore } from "@/store/info";
 import { getActivityData, isGetPhone } from "@/utils/system";
@@ -41,38 +41,13 @@ import UserLoginPopup from "@/components/userLoginPopup.vue";
 
 const current = ref<number>(0);
 const appid = uni.getStorageSync("appid");
-onLoad(() => {
-  getBanner();
-});
 
-const payment = () => {
+const onLogin = () => {
   uni.login({
     //获取code，
     success: (res) => {
-      var code = res.code,
-        appId = "wx4f6dc4ac1674547c",
-        secret = "9e0e7fe5161541d9862b8ee2db6da840";
-      console.log("正在登录中...");
-      //根据获取的code去腾讯服务器，请求用户数据，返回的结果中，包含openid
-      wx.request({
-        url:
-          "https://api.weixin.qq.com/sns/jscode2session?appid=" +
-          appId +
-          "&secret=" +
-          secret +
-          "&js_code=" +
-          code +
-          "&grant_type=authorization_code",
-        data: {},
-        header: {
-          "content-type": "json",
-        },
-        success: (user_res) => {
-          //请求成功获取openid；
-          const user_openid = user_res.data.openid;
-          uni.setStorageSync("openid", user_openid);
-          console.log("登录成功", user_openid);
-        },
+      getOpenId(res.code).then((res: any) => {
+        uni.setStorageSync("openid", res.data.openid);
       });
     },
   });
@@ -95,6 +70,12 @@ const toActivity = () => {
     });
   }
 };
+
+onLoad(() => {
+  onLogin();
+  getBanner();
+});
+
 onShow(() => {
   getActivityData();
 });

src/pagesOne/record/winnerList.vue

@@ -26,6 +26,7 @@
         <view
           class="widthBtn"
           :class="item.processStatus === '3' ? 'active' : 'static'"
+          @click="onPayment(item)"
           >提现</view
         >
       </view>
@@ -36,7 +37,7 @@
 <script lang="ts" setup>
 import { onLoad } from "@dcloudio/uni-app";
 import { ref } from "vue";
-import { auditSuccessList } from "@/services/ams";
+import { auditSuccessList, payment } from "@/services/ams";
 const openid = uni.getStorageSync("openid");
 
 const list = <any>ref([]);
@@ -47,6 +48,23 @@ const getList = () => {
   });
 };
 
+const onPayment = (data: any) => {
+  if (data.processStatus != "3") return;
+  payment(data.id)
+    .then((res: any) => {
+      if (res.code === 200) {
+        uni.showToast({ icon: "success", title: "提现成功" });
+      } else {
+        uni.showToast({ icon: "none", title: "提现失败" });
+      }
+
+      getList();
+    })
+    .catch((err) => {
+      uni.showToast({ icon: "none", title: err.msg });
+    });
+};
+
 onLoad(() => {
   getList();
 });
@@ -159,6 +177,8 @@ onLoad(() => {
     color: #fff;
     line-height: 48rpx;
     text-align: center;
+    position: relative;
+    z-index: 999;
     &.static {
       background: #d1d1d6;
     }

src/pagesOne/winner/components/uploadReceptPopop.vue

@@ -79,12 +79,27 @@ const toUploadImage = (type: string) => {
     marketingActivityId: props.id,
     discountId: discountId.value,
   };
-  validate(params).then((res: any) => {
-    console.log("验证次数", res);
-  });
-  uni.navigateTo({
-    url: `/pagesOne/winner/uploadImage?discountId=${discountId.value}&discountLevel=${discountLevel.value}`,
-  });
+  validate(params)
+    .then((res: any) => {
+      if (res.valid) {
+        uni.navigateTo({
+          url: `/pagesOne/winner/uploadImage?discountId=${discountId.value}&discountLevel=${discountLevel.value}`,
+        });
+        return;
+      }
+      uni.showToast({
+        title: "该活动力度次数您已经用完啦，换一个活动力度参与吧",
+        icon: "none",
+      });
+      return;
+    })
+    .catch((err) => {
+      uni.showToast({
+        title: err.msg,
+        icon: "none",
+      });
+    });
+
   emit("update:show", false);
 };
 

src/services/ams.ts

@@ -76,13 +76,28 @@ export const postLoginAPI = (data: any) => {
   });
 };
 
+// 验证是否可以抽奖
 export const validate = (data: any) => {
   return http({
     method: "POST",
     url: `/miniApp/validate/${data.marketingActivityId}`,
-    data: {
-      openid: data.openid,
-      discountId: data.discountId,
-    },
+    data,
+  });
+};
+
+//获取openId
+export const getOpenId = (data: any) => {
+  return http({
+    method: "GET",
+    url: `/miniApp/getOpenId/${data}`,
+    data,
+  });
+};
+
+export const payment = (data: any) => {
+  return http({
+    method: "POST",
+    url: `/customer/payment/${data}`,
+    data,
   });
 };