Ver Fonte

提测第一版

zzf há 2 anos atrás
pai
commit
6f5b758d56
7 ficheiros alterados com 27 adições e 22 exclusões
  1. 7 1
      package-lock.json
  2. 1 0
      package.json
  3. 2 1
      src/main.js
  4. 3 4
      src/util/request.js
  5. 8 10
      src/view/Home/Home.vue
  6. 4 5
      src/view/Home/home.css
  7. 2 1
      vite.config.js

+ 7 - 1
package-lock.json

@@ -11,8 +11,9 @@
         "amfe-flexible": "^2.2.1",
         "axios": "^0.24.0",
         "dsbridge": "^3.1.4",
+        "eruda": "^3.0.0",
         "qs": "^6.10.2",
-        "vant": "^3.6.11",
+        "vant": "^3.3.6",
         "vue": "^3.2.16",
         "vue-router": "^4.0.12",
         "vue-wechat-title": "^2.0.7"
@@ -408,6 +409,11 @@
       "integrity": "sha512-erwx5r69B/WFfFuF2jcNN0817BfDBdC4765kQ6WltOMuwsimlQo3JTEq0Cle+wpHralwdeX3OfAtw/mHxPK0Wg==",
       "dev": true
     },
+    "node_modules/eruda": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/eruda/-/eruda-3.0.0.tgz",
+      "integrity": "sha512-6L8A8aBHOQv0rqeBlNdJEl/hl6OAdLVRtJlVmBIlIJ6Fe1a92HFXO58jHLC0vFyuKV0deTjYjRaWwLo9lJ9K9A=="
+    },
     "node_modules/es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz",

+ 1 - 0
package.json

@@ -14,6 +14,7 @@
     "amfe-flexible": "^2.2.1",
     "axios": "^0.24.0",
     "dsbridge": "^3.1.4",
+    "eruda": "^3.0.0",
     "qs": "^6.10.2",
     "vant": "^3.3.6",
     "vue": "^3.2.16",

+ 2 - 1
src/main.js

@@ -11,7 +11,8 @@ const app = Vue.createApp(App);
 
 
 var userToken = bridge.call('gettoken');
-var userToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsYXQiOjE2ODU3NTI3NzQsIm5iZiI6MTY4NTc1Mjc3NCwiZXhwIjoxNjg2MzU3NTc0LCJ1aWQiOiI4MTAzNCIsIndlYnNpdGUiOiJ3ZXN0a2lzcyJ9.K_zn4eGsxB1hEJ9KIdEjRvOGXDP1m-v6n_Nwkp13az4";
+// var userToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsYXQiOjE2ODYxMjA5NTMsIm5iZiI6MTY4NjEyMDk1MywiZXhwIjoxNjg2NTUyOTUzLCJ1aWQiOiIxNjE0MDEiLCJ3ZWJzaXRlIjoiYWxpcGVhcmxoYWlyIn0.saQc_A-aFj8zaZ8nyXPZhJogA9Kt5ghxqtzhEEgkwcY";
+// var userToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsYXQiOjE2ODYxMjk3ODEsIm5iZiI6MTY4NjEyOTc4MSwiZXhwIjoxNjg2NTYxNzgxLCJ1aWQiOiIxNjEzMjciLCJ3ZWJzaXRlIjoiYWxpcGVhcmxoYWlyIn0.nlquLgwNulrTUeECyr4CQROtOJijy99AwWehrh7IJHc";
 
 
 console.log('入口文件获取userToken ----- ', userToken);

+ 3 - 4
src/util/request.js

@@ -42,12 +42,11 @@ axiosInstance.interceptors.request.use(function (config) {
     if(env === 'production') {
         let apiTypeReg = /(\/app\-api\/)|(\/api\/)/ig;
         let urlMap = {
-            '/api/':'https://actapi.snjon.com',
+            '/api/':'https://actapi.snjon.com',  
             // 'https://actapi.longyihair.com',
-            '/app-api/': 'https://ios.alipearlhair.com',
-            // 'https://app.westkiss.com'
+            '/app-api/': 'https://alipearlapp.snjon.com'//,
+            // 'https://ios.alipearlhair.com',   //正式站
             // '/api/': 'https://actapi.snjon.com',
-            // '/app-api/': 'https://westkissapp.snjon.com'
         };
         let urlType = config.url.match(apiTypeReg)[0];
         if(urlType) {

Diff do ficheiro suprimidas por serem muito extensas
+ 8 - 10
src/view/Home/Home.vue


+ 4 - 5
src/view/Home/home.css

@@ -1,7 +1,6 @@
 .lucky-wheel-page{
     box-sizing: border-box;
     width: 100%;
-    padding-bottom: 1.0667rem;
 }
 .lucky-wheel-page-header{
     position: relative;
@@ -38,7 +37,7 @@
     background-position: 0 0;
     background-size: 100% auto;
     background-repeat: no-repeat;
-    padding-top: .5333rem;
+    padding-top: .8rem;
 }
 .lucky-wheel-top{
     box-sizing: border-box;
@@ -386,11 +385,11 @@ background: linear-gradient(336deg, #FEDFA9 0%, #E0B17E 100%);
     box-sizing: border-box;
     width: 100%;
     margin-top: .5333rem;
+    padding-bottom: 1.3333rem;
 }
 .lucky-wheel-picked{
     box-sizing: border-box;
     width: 100%;
-    padding: .5333rem 0rem;
     border-radius: 4px;
 }
 .lucky-wheel-picked-title{
@@ -683,8 +682,8 @@ background: linear-gradient(336deg, #FEDFA9 0%, #E0B17E 100%);
     font-family: "Rokkitt-Medium";
   }
   .productcard-item-num .icon{
-    width: .5333rem;
-    height: .5333rem;
+    width: .3733rem;
+    height: .48rem;
     margin-right: .08rem;
   }
   .productcard-item-shopnow.none{

+ 2 - 1
vite.config.js

@@ -66,7 +66,8 @@ export default defineConfig({
         //   '/api': 'http://www.myblog.com/api',
           // 选项写法
           '/app-api': {
-            target: "https://ios.alipearlhair.com",//'http://www.myblog.com',
+            target: 'htttps:alipearlapp.snjon.com',
+            // "https://ios.alipearlhair.com",//正式站    'http://www.myblog.com',
             changeOrigin: true, // 设置成false报错
             // rewrite: (path) => {
             //     console.log(path,'ooooooooooooo');