update:整合

src/App.vue

@@ -2,7 +2,7 @@
  * @Author: wwxin
  * @Date: 2022-09-17 14:20:36
  * @LastEditors: wwxin 2463926940@qq.com
- * @LastEditTime: 2024-07-29 11:14:34
+ * @LastEditTime: 2024-07-29 15:30:04
  * @FilePath: /ll-web-channel-saas-merchant/src/App.vue
  * @Description: 
  * 
@@ -12,6 +12,7 @@ import Fingerprint2 from 'fingerprintjs2'
 
 export default {
   onLaunch (options) {
+    console.log(options,'options11小程序启动参数');
   // 在小程序启动时（包括从其他小程序打开时）获取传递过来的参数
   if (options.referrerInfo && options.referrerInfo.extraData) {
       this.handleIncomingData(options.referrerInfo.extraData);

src/pages/agreement.vue

@@ -2,7 +2,7 @@
  * @Author: wwxin 
  * @Date: 2023-12-08 13:58:32
  * @LastEditors: wwxin 2463926940@qq.com
- * @LastEditTime: 2024-07-29 11:33:49
+ * @LastEditTime: 2024-07-29 15:23:50
  * @FilePath: /sharetea-user/src/pagesUser/profile.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -44,7 +44,7 @@ export default {
   background: #fff;
   width: 100%;
   height: 100vh;
-  padding: 20px;
+   padding: 20px;
   image {
     width: 100%;
     height: 100%;

src/pages/home.vue

@@ -1,6 +1,6 @@
 <template>
   <scroll-view scroll-y>
-    <u-navbar :title="navTitle" :is-back="false"></u-navbar>
+    <u-navbar :title="navTitle" :is-back="false" ></u-navbar>
 
     <view
       class="index-page"
@@ -13,10 +13,16 @@
           <!-- {{ ntext.join("" + longSpace) }} -->
         </u-notice-bar>
         <view class="transaction-view" ref="myTransactionView">
+          <!-- <button
+            class="trasition-btns"
+            :style="{ backgroundImage: 'url(' + coverBtnImgUrl + ')' }"
+            open-type="getPhoneNumber"
+                @getphonenumber="getPhoneNumber"
+                type="text"
+          ></button> -->
           <button
             class="trasition-btns"
             :style="{ backgroundImage: 'url(' + coverBtnImgUrl + ')' }"
-            type="button"
             @click="submitOrder"
           ></button>
           <view class="agreement-view" style="padding: 0 30px">
@@ -70,6 +76,7 @@
 <script>
 import { resourceInfo, proOrder, resourceAreaAv, resourceTel } from "@/service";
 import md5 from "js-md5";
+import {showTel} from '@/util/tool'
 export default {
   data() {
     return {
@@ -115,80 +122,15 @@ export default {
     // },
   },
   methods: {
-    showTel() {
+    //获取用户手机号码
-      // 获取随机手机号
+    getPhoneNumber(e) {
-      var telArr = this.getRandomTel();
+      let that = this;
-      let content = [];
+      console.log(e,'eee');
-      for (var t = 0; t < telArr.length; t++) {
+      if (e.detail.errMsg == "getPhoneNumber:ok") {
-        if (t % 7 == 0) {
+        let res = e.detail;
-          content.push(telArr[t] + "已领取爱奇艺月卡会员");
+        console.log(res,8989);
-        } else if (t % 7 == 1) {
+    
-          content.push(telArr[t] + "已领取优酷VIP月卡会员");
-        } else if (t % 7 == 2) {
-          content.push(telArr[t] + "已领取芒果TV月卡会员");
-        } else if (t % 7 == 3) {
-          content.push(telArr[t] + "已领取喜马拉雅VIP月卡会员");
-        } else if (t % 7 == 4) {
-          content.push(telArr[t] + "已领取青桔单车月卡会员");
-        } else if (t % 7 == 5) {
-          content.push(telArr[t] + "已领取饿了么月卡会员");
-        } else if (t % 7 == 6) {
-          content.push(telArr[t] + "已领取QQ绿钻月卡会员");
-        }
       }
-      return content;
-    },
-    getRandomTel() {
-      var numArray = new Array(
-        "139",
-        "138",
-        "137",
-        "136",
-        "135",
-        "134",
-        "159",
-        "158",
-        "157",
-        "150",
-        "151",
-        "152",
-        "188",
-        "187",
-        "182",
-        "183",
-        "184",
-        "178",
-        "130",
-        "131",
-        "132",
-        "156",
-        "155",
-        "186",
-        "185",
-        "176",
-        "133",
-        "153",
-        "189",
-        "180",
-        "181",
-        "177"
-      );
-      var numList = "";
-      var arraryLength = numArray.length;
-      for (var n = 0; n < 120; n++) {
-        var i = parseInt(Math.random() * arraryLength);
-        var num = numArray[i];
-        for (var j = 0; j < 8; j++) {
-          num = num + Math.floor(Math.random() * 10);
-          var result = num.substr(0, 3) + "****" + num.substr(7);
-        }
-        if (n == 0) {
-          numList = numList + result;
-        } else {
-          numList = numList + "," + result;
-        }
-      }
-      return numList.split(",").slice(0, -1);
     },
     shouye() {
       resourceInfo({ promotionCode: "arSOtc" }).then((result) => {
@@ -280,9 +222,11 @@ export default {
       );
     },
   },
-  onLoad() {
+  onLoad(opt) {
+    // this.promotionCode = opt.promotionCode;
+    console.log(opt,'optt');
     this.maidian();
-    this.ntext = this.showTel();
+    this.ntext = showTel();
   },
 };
 </script>

src/util/http/env.js

@@ -1,15 +1,14 @@
 /*
  * @Author: wwxin 
  * @Date: 2023-02-04 11:05:26
- * @LastEditors: wwxin 
+ * @LastEditors: wwxin 2463926940@qq.com
- * @LastEditTime: 2023-12-15 16:26:53
+ * @LastEditTime: 2024-07-29 15:00:48
  * @FilePath: /用户端/src/util/http/env.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 // 测试环境
 const DEV_BASE_URL = "http://zong.xtl10.fun";
 let BASE_URL = DEV_BASE_URL;
-console.debug("env.js:40", process.env);
 const envConfig = {
   BASE_URL,
   version: 1,

src/util/http/index.js

@@ -1,9 +1,6 @@
 import { getStorage } from "@/util/tool";
 import { USER_TOKEN } from "@/constant";
 import { envConfig } from "./env.js";
-
-// console.debug(process.env.NODE_ENV);
-// console.debug(envConfig);
 const baseUrl = envConfig.BASE_URL;
 
 const ERR_OK = 'S00000';
@@ -76,24 +73,8 @@ export const post = (url, params = {}) => {
       timeout: 1000 * 60 * 5,
       success(res) {
         if (res.data.code === ERR_OK) {
-          // !特殊逻辑抛出Token
+          resolve(res.data.result);
-          if (url === "/user/login/code") {
-            resolve({ data: res.data.data, header: res.header });
-          } else {
-            resolve(res.data.data);
-          }
         } else {
-          if (url === "/channel/auth/enterpriseAuth") {
-            uni.showToast({
-              title: "企业认证失败",
-              icon: "none",
-              duration: 3000,
-              success: function () {},
-            });
-          } else if (url === "/channel/data/sendAccountExcel") {
-          } else {
-           
-          }
           return reject(res.data);
         }
       },

src/util/tool/index.js

@@ -237,3 +237,40 @@ export const number2text = (number, type = "lower") => {
   // 如果是整数，则补个整字
   return `${_integer}` + _decimal;
 };
+//获取随机号码展示领取会员
+export const showTel = () => {
+  const telArr = getRandomTel();
+  const membershipTypes = [
+    "已领取爱奇艺月卡会员",
+    "已领取优酷VIP月卡会员",
+    "已领取芒果TV月卡会员",
+    "已领取喜马拉雅VIP月卡会员",
+    "已领取青桔单车月卡会员",
+    "已领取饿了么月卡会员",
+    "已领取QQ绿钻月卡会员"
+  ];
+
+  return telArr.map((tel, index) => `${tel} ${membershipTypes[index % 7]}`);
+};
+export const getRandomTel = () => {
+  const numArray = [
+    "139", "138", "137", "136", "135", "134", "159", "158", "157", "150",
+    "151", "152", "188", "187", "182", "183", "184", "178", "130", "131",
+    "132", "156", "155", "186", "185", "176", "133", "153", "189", "180",
+    "181", "177"
+  ];
+  const numList = [];
+  const arraryLength = numArray.length;
+
+  for (let n = 0; n < 120; n++) {
+    const prefix = numArray[Math.floor(Math.random() * arraryLength)];
+    let num = prefix;
+    for (let j = 0; j < 8; j++) {
+      num += Math.floor(Math.random() * 10);
+    }
+    const maskedNum = `${num.slice(0, 3)}****${num.slice(7)}`;
+    numList.push(maskedNum);
+  }
+
+  return numList;
+};