提示语修改

src/pagesOne/winner/components/uploadReceptPopop.vue

@@ -90,10 +90,9 @@ const toUploadImage = (type: string) => {
         return;
       }
       uni.showToast({
-        title: "该活动力度次数您已经用完啦，换一个活动力度参与吧",
+        title: res.message || "",
         icon: "none",
       });
-      return;
     })
     .catch((err) => {
       uni.showToast({

src/pagesOne/winner/index.vue

@@ -77,12 +77,12 @@
     <win-record-popup
       v-model:show="showWiner"
       :list="winnerData"
-			@scrolltolower="winScrolltolower"
+      @scrolltolower="winScrolltolower"
     ></win-record-popup>
     <upload-record-popup
       v-model:show="showRecord"
       :list="rewardData"
-			@scrolltolower="scrolltolower"
+      @scrolltolower="scrolltolower"
     ></upload-record-popup>
     <activity-desc-popup
       v-model:show="showDesc"
@@ -122,16 +122,16 @@ const isAddress = computed(() => {
 });
 
 const params = reactive({
-	pageSize:10,
-	pageNum:1,
-	currentPage:1
-})
+  pageSize: 10,
+  pageNum: 1,
+  currentPage: 1,
+});
 
 const winParams = reactive({
-	pageSize:10,
-	pageNum:1,
-	currentPage:1
-})
+  pageSize: 10,
+  pageNum: 1,
+  currentPage: 1,
+});
 
 const getList = () => {
   getActivity(appid)
@@ -159,30 +159,32 @@ const rewardData = ref([]);
 //获取上传记录
 const getRewardList = () => {
   console.log("openid", openid);
-  rewardList({ openid, marketingActivityId: aData.id,...params }).then((res: any) => {
-		params.currentPage = Math.ceil(res.total / params.pageSize)
-		rewardData.value = [...rewardData.value,...res.rows];
-  });
+  rewardList({ openid, marketingActivityId: aData.id, ...params }).then(
+    (res: any) => {
+      params.currentPage = Math.ceil(res.total / params.pageSize);
+      rewardData.value = [...rewardData.value, ...res.rows];
+    }
+  );
 };
 
-const scrolltolower = ()=>{
-	if (params.pageNum < params.currentPage) {
-		params.pageNum ++
-		getRewardList()
-	}
-}
+const scrolltolower = () => {
+  if (params.pageNum < params.currentPage) {
+    params.pageNum++;
+    getRewardList();
+  }
+};
 
-const winScrolltolower = ()=>{
-	if (winParams.pageNum < winParams.currentPage) {
-		winParams.pageNum ++
-		getWinnerList()
-	}
-}
+const winScrolltolower = () => {
+  if (winParams.pageNum < winParams.currentPage) {
+    winParams.pageNum++;
+    getWinnerList();
+  }
+};
 
 //打开上传记录
 const showUploadRecord = () => {
-	params.pageNum = 1;
-	rewardData.value = [];
+  params.pageNum = 1;
+  rewardData.value = [];
   getRewardList();
   showRecord.value = true;
 };
@@ -190,18 +192,20 @@ const showUploadRecord = () => {
 const winnerData = ref([]);
 //获取奖励记录
 const getWinnerList = () => {
-  auditSuccessList({ openid, marketingActivityId: aData.id,...winParams }).then(
-    (res: any) => {
-			winParams.currentPage = Math.ceil(res.total / winParams.pageSize)
-			winnerData.value = [...winnerData.value,...res.rows];
-    }
-  );
+  auditSuccessList({
+    openid,
+    marketingActivityId: aData.id,
+    ...winParams,
+  }).then((res: any) => {
+    winParams.currentPage = Math.ceil(res.total / winParams.pageSize);
+    winnerData.value = [...winnerData.value, ...res.rows];
+  });
 };
 
 //打开获奖记录
 const showWinerRecord = () => {
-	winParams.pageNum = 1;
-	winnerData.value = [];
+  winParams.pageNum = 1;
+  winnerData.value = [];
   getWinnerList();
   showWiner.value = true;
 };
@@ -229,8 +233,6 @@ const handledUpload = () => {
         uni.authorize({
           scope: "scope.address",
           success() {
-            console.log("1111111111111111111");
-
             // 用户同意授权
           },
           fail() {
@@ -248,8 +250,6 @@ const handledUpload = () => {
         uni.getLocation({
           type: "wgs84",
           success: function (res) {
-            console.log("---------------------------", res);
-
             console.log("当前位置的经度：" + res.longitude);
             console.log("当前位置的纬度：" + res.latitude);
             uni.setStorageSync("location", JSON.stringify(res));

src/pagesOne/winner/uploadImage.vue

@@ -14,7 +14,7 @@
       />
     </wd-upload>
     <view class="tips">最多上传5张照片</view>
-		<!-- // <button class="btn" @click="onAdd" :loading="loading">{{loading ? '上传中' :'立即上传'}}</button> -->
+    <!-- // <button class="btn" @click="onAdd" :loading="loading">{{loading ? '上传中' :'立即上传'}}</button> -->
     <view class="btn" @click="toAdd">立即上传</view>
   </view>
 </template>
@@ -64,11 +64,13 @@ const handleRemove = (file: any) => {
   imgList.value = imgList.value.filter((item) => item !== data.url);
 };
 
-const loading = ref(false)
+const loading = ref(false);
 const onAdd = () => {
-	// if(loading.value) return
-	// loading.value = true
-  const location = uni.getStorageSync("location") ? JSON.parse(uni.getStorageSync("location")) : {};
+  // if(loading.value) return
+  // loading.value = true
+  const location = uni.getStorageSync("location")
+    ? JSON.parse(uni.getStorageSync("location"))
+    : {};
   if (imgList.value.length === 0)
     return uni.showToast({ title: "请上传图片", icon: "none" });
   const params = {
@@ -90,12 +92,11 @@ const onAdd = () => {
           if (
             response["FWGvRFSZ65JVrMsTqeBoT9hJYyeN9Z_aFAacMxoPlhY"] === "accept"
           ) {
-						uni.showToast({ title: "操作成功！", icon: "none" });
-						setTimeout(()=>{
-							uni.navigateBack();
-						},1000)
+            uni.showToast({ title: "操作成功！", icon: "none" });
           }
-          // uni.showToast({ title: "订阅成功", icon: "success" });
+          setTimeout(() => {
+            uni.navigateBack();
+          }, 800);
         },
         fail(err) {
           uni.showToast({ title: "订阅失败", icon: "error" });
@@ -103,35 +104,33 @@ const onAdd = () => {
         },
       });
     } else {
-      uni.showToast({ title: "上传图片失败", icon: "error" });
+      uni.showToast({ title: res.msg, icon: "none" });
     }
   });
 };
 
+const throttle = (func: any, limit: any) => {
+  let lastFunc: any;
+  let lastRan: any;
+  return function (...args: any) {
+    const context = this;
+    const now = Date.now();
+    if (!lastRan) {
+      func.apply(context, args);
+      lastRan = now;
+    } else {
+      clearTimeout(lastFunc);
+      lastFunc = setTimeout(function () {
+        if (now - lastRan >= limit) {
+          func.apply(context, args);
+          lastRan = now;
+        }
+      }, limit - (now - lastRan));
+    }
+  };
+};
 
-
-const throttle=(func:any, limit:any) => {
-  let lastFunc:any;
-  let lastRan:any;
-  return function (...args:any) {
-    const context = this;
-    const now = Date.now();
-    if (!lastRan) {
-      func.apply(context, args);
-      lastRan = now;
-    } else {
-      clearTimeout(lastFunc);
-      lastFunc = setTimeout(function () {
-        if (now - lastRan >= limit) {
-          func.apply(context, args);
-          lastRan = now;
-        }
-      }, limit - (now - lastRan));
-    }
-  };
-}
-
-const toAdd = throttle(onAdd,3000)
+const toAdd = throttle(onAdd, 3000);
 
 onLoad((options: any) => {
   routerInfo.discountId = options.discountId;

src/utils/http.ts

@@ -12,7 +12,7 @@
 // import { loadEnv } from "vite";
 // const env: Record<string, string> = loadEnv();
 const baseURL = import.meta.env.VITE_API_URL; //process.env.VITE_API_URL;
-console.log("--------------------------", import.meta.env.VITE_API_URL);
+// console.log("--------------------------", import.meta.env.VITE_API_URL);
 
 // const baseURL = import.meta.env.MODE === 'production' ? import.meta.env.VITE_API_URL + '/prod-api' : import.meta.env.VITE_API_URL
 // const baseURL = import.meta.env.VITE_API_URL + '/prod-api'