From 681efe897b7fb4dbe8bec5fa5056209e3e0edfdc Mon Sep 17 00:00:00 2001
From: Liuyi <candymxq888@outlook.com>
Date: 星期三, 20 十一月 2024 17:19:57 +0800
Subject: [PATCH] 添加积分商品详情,替换首页海报,调整样式,添加积分规则

---
 unpackage/dist/dev/mp-weixin/app.js |   92 ++++++++++++---------------------------------
 1 files changed, 25 insertions(+), 67 deletions(-)

diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 226ae33..c69b0b3 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -9,6 +9,9 @@
   "./pages/functionList/balanceRecord/index.js";
   "./pages/functionList/paymentRecord/index.js";
   "./pages/functionList/rechargeRecord/index.js";
+  "./pages/functionList/share/cardShare/index.js";
+  "./pages/functionList/share/shareConfirm/index.js";
+  "./pages/functionList/share/shareList/index.js";
   "./pages/scanWater/index.js";
   "./pages/recharge/index.js";
   "./pages/sendWater/index.js";
@@ -19,94 +22,48 @@
   "./pages/success/index.js";
   "./pages/facilityList/index.js";
   "./pages/station/index.js";
+  "./pages/infoBreakdown/index.js";
+  "./pages/scanRecharge/index.js";
+  "./pages/scanSuccess/index.js";
+  "./pages/counterRecharge/index.js";
+  "./pages/pointsMall/index.js";
+  "./pages/wxScanWater/index.js";
+  "./pages/pointsMall/pointsGetRecord/index.js";
+  "./pages/pointsMall/pointsExchangeRecord/index.js";
+  "./pages/pointsMall/pointsGoodsDetail/index.js";
+  "./pages/pointsMall/pointsrule/index.js";
 }
 const _sfc_main = {
   __name: "App",
   setup(__props) {
     function wxLogin() {
-      common_vendor.index.removeStorageSync("openId");
       if (!common_vendor.index.getStorageSync("openId")) {
         common_vendor.wx$1.login({
           success: async (res1) => {
             common_vendor.index.setStorageSync("code", res1.code);
             await api_index.wxLoginApi({ code: res1.code }).then((res2) => {
-              common_vendor.index.setStorageSync("openId", res2.data.userId);
-              common_vendor.index.setStorageSync("token", res2.data.token);
+              if (res2.code == 200) {
+                common_vendor.index.setStorageSync("openId", res2.data.userId);
+                common_vendor.index.setStorageSync("token", res2.data.token);
+              } else {
+                console.log("登录接口调用失败");
+              }
             });
           },
           fail: (e) => {
             common_vendor.index.showToast({
-              title: "登录失败,请退出重试!",
-              duration: 2e3
+              title: "微信登录失败,请退出重试!",
+              duration: 2e3,
+              icon: "fail"
             });
             console.log(e);
           }
         });
       }
     }
-    let userLocation = {
-      lat: "",
-      lon: ""
-    };
-    function getUserLocation() {
-      common_vendor.index.authorize({
-        scope: "scope.userLocation",
-        success() {
-          console.log("成功授权位置信息1");
-          storageLocation();
-        },
-        fail() {
-          console.log("用户拒绝授权位置信息,再次提示用户授权");
-          showToast();
-        }
-      });
-      function storageLocation() {
-        common_vendor.index.getLocation({
-          type: "gcj02",
-          isHighAccuracy: true,
-          success: (res) => {
-            userLocation.lat = res.latitude;
-            userLocation.lon = res.longitude;
-            common_vendor.index.setStorageSync("userLocation", JSON.stringify(userLocation));
-          },
-          fail: () => {
-            showToast();
-          }
-        });
-      }
-      function showToast() {
-        common_vendor.index.showModal({
-          title: "请求授权当前位置",
-          content: "我们需要获取地理位置信息,为您获取附近站点信息!",
-          confirmText: "前往设置",
-          success: (res) => {
-            if (res.confirm) {
-              common_vendor.index.openSetting({
-                success: (res1) => {
-                  if (res1.authSetting["scope.userLocation"]) {
-                    console.log("用户二次授权成功");
-                    storageLocation();
-                  } else {
-                    showToast();
-                    console.log("用户拒绝授权");
-                  }
-                }
-              });
-            } else {
-              common_vendor.index.showToast({
-                title: "请先授权!",
-                duration: 2e3,
-                icon: "none"
-              });
-              showToast();
-            }
-          }
-        });
-      }
-    }
     common_vendor.onLaunch(async () => {
       await wxLogin();
-      await getUserLocation();
+      console.log("进入项目启动页APP.vue了");
     });
     common_vendor.onShow(() => {
       console.log("App Show");
@@ -119,10 +76,11 @@
   }
 };
 const navbar = () => "./components/navbar/navbar.js";
+const pointNavbar = () => "./components/pointNavbar/pointNavbar.js";
 const DaTree = () => "./components/da-tree/index.js";
 function createApp() {
   const app = common_vendor.createSSRApp(_sfc_main);
-  app.component("navbar", navbar).component("DaTree", DaTree);
+  app.component("navbar", navbar).component("pointNavbar", pointNavbar).component("DaTree", DaTree);
   return {
     app
   };

--
Gitblit v1.9.3