panhui 4 سال پیش
والد
کامیت
fd308b6764

BIN
.DS_Store


+ 1 - 1
.env.development

@@ -1 +1 @@
-VUE_APP_BASE_URL=http://192.168.50.120:8080
+VUE_APP_BASE_URL=https://zhuoka.izouma.com

+ 173 - 173
project.config.json

@@ -1,180 +1,180 @@
 {
-    "description": "项目配置文件",
-    "packOptions": {
-        "ignore": []
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "enhance": false,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": true,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
     },
-    "setting": {
-        "urlCheck": false,
-        "es6": true,
-        "enhance": false,
-        "postcss": true,
-        "preloadBackgroundData": false,
-        "minified": true,
-        "newFeature": true,
-        "coverView": true,
-        "nodeModules": false,
-        "autoAudits": false,
-        "showShadowRootInWxmlPanel": true,
-        "scopeDataCheck": false,
-        "uglifyFileName": false,
-        "checkInvalidKey": true,
-        "checkSiteMap": true,
-        "uploadWithSourceMap": true,
-        "compileHotReLoad": false,
-        "useMultiFrameRuntime": true,
-        "useApiHook": true,
-        "useApiHostProcess": true,
-        "babelSetting": {
-            "ignore": [],
-            "disablePlugins": [],
-            "outputPath": ""
-        },
-        "enableEngineNative": false,
-        "bundle": false,
-        "useIsolateContext": true,
-        "useCompilerModule": true,
-        "userConfirmedUseCompilerModuleSwitch": false,
-        "userConfirmedBundleSwitch": false,
-        "packNpmManually": false,
-        "packNpmRelationList": [],
-        "minifyWXSS": true
+    "enableEngineNative": false,
+    "bundle": false,
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.16.1",
+  "appid": "wxf3120271892d4f18",
+  "projectname": "%E5%8D%A1%E7%89%8C%E5%B0%8F%E7%A8%8B%E5%BA%8F",
+  "cloudfunctionTemplateRoot": "",
+  "watchOptions": {
+    "ignore": []
+  },
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "scripts": {},
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "miniprogramRoot": "dist-wechat/",
+  "condition": {
+    "search": {
+      "list": []
     },
-    "compileType": "miniprogram",
-    "libVersion": "2.16.1",
-    "appid": "wxf3120271892d4f18",
-    "projectname": "%E5%8D%A1%E7%89%8C%E5%B0%8F%E7%A8%8B%E5%BA%8F",
-    "cloudfunctionTemplateRoot": "",
-    "watchOptions": {
-        "ignore": []
+    "conversation": {
+      "list": []
     },
-    "debugOptions": {
-        "hidedInDevtools": []
+    "plugin": {
+      "list": []
     },
-    "scripts": {},
-    "simulatorType": "wechat",
-    "simulatorPluginLibVersion": {},
-    "miniprogramRoot": "dist-wechat/",
-    "condition": {
-        "search": {
-            "list": []
-        },
-        "conversation": {
-            "list": []
-        },
-        "plugin": {
-            "list": []
-        },
-        "game": {
-            "list": []
-        },
-        "gamePlugin": {
-            "list": []
-        },
-        "miniprogram": {
-            "list": [
-                {
-                    "id": -1,
-                    "name": "消息",
-                    "pathName": "/pages/news",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "聊天页面",
-                    "pathName": "/pages/chat",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "我的",
-                    "pathName": "/pages/mine",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "我的收藏",
-                    "pathName": "/pages/mineFollow",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "个人设置",
-                    "pathName": "/pages/setting",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "我的钱包",
-                    "pathName": "/pages/wallet",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "授权登陆",
-                    "pathName": "/pages/authorized",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "常见问题",
-                    "pathName": "/pages/questions",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "选择地址",
-                    "pathName": "/pages/chooseAddress",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "订单详情",
-                    "pathName": "/pages/orderdetails",
-                    "query": "id=779"
-                },
-                {
-                    "id": -1,
-                    "name": "新增地址",
-                    "pathName": "/pages/receiving",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "首页",
-                    "pathName": "/pages/Home",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "拼箱详情",
-                    "pathName": "/pages/details",
-                    "query": "id=209"
-                },
-                {
-                    "id": -1,
-                    "name": "收货地址",
-                    "pathName": "/pages/address",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "确认订单",
-                    "pathName": "/pages/confirmorder",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "我买到的",
-                    "pathName": "/pages/allorder",
-                    "scene": null
-                },
-                {
-                    "id": -1,
-                    "name": "店铺申请",
-                    "pathName": "/pages/store/apply",
-                    "scene": null
-                }
-            ]
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": [
+        {
+          "id": -1,
+          "name": "消息",
+          "pathName": "/pages/news",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "聊天页面",
+          "pathName": "/pages/chat",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "我的",
+          "pathName": "/pages/mine",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "我的收藏",
+          "pathName": "/pages/mineFollow",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "个人设置",
+          "pathName": "/pages/setting",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "我的钱包",
+          "pathName": "/pages/wallet",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "授权登陆",
+          "pathName": "/pages/authorized",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "常见问题",
+          "pathName": "/pages/questions",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "选择地址",
+          "pathName": "/pages/chooseAddress",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "订单详情",
+          "pathName": "/pages/orderdetails",
+          "query": "id=779"
+        },
+        {
+          "id": -1,
+          "name": "新增地址",
+          "pathName": "/pages/receiving",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "首页",
+          "pathName": "/pages/Home",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "拼箱详情",
+          "pathName": "/pages/details",
+          "query": "id=209"
+        },
+        {
+          "id": -1,
+          "name": "收货地址",
+          "pathName": "/pages/address",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "确认订单",
+          "pathName": "/pages/confirmorder",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "我买到的",
+          "pathName": "/pages/allorder",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "店铺申请",
+          "pathName": "/pages/store/apply",
+          "scene": null
         }
+      ]
     }
-}
+  }
+}

BIN
src/.DS_Store


BIN
src/native/.DS_Store


+ 11 - 0
src/native/svgs/icon_bianji.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="25px" height="24px" viewBox="0 0 25 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_bianji</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="我的-已登录" transform="translate(-310.000000, -115.000000)" stroke="#C8C9CC" stroke-width="1.6">
+            <g id="路径-2" transform="translate(311.000000, 115.000000)">
+                <path d="M20.5355339,18.7781746 L5.97918472,18.7781746 C4.87461522,18.7781746 3.97918472,17.8827441 3.97918472,16.7781746 L3.97918472,13.9497475 C3.97918472,13.4193145 4.1898984,12.9106067 4.56497116,12.5355339 L12.4644661,4.63603897 C13.2455147,3.85499039 14.5118446,3.85499039 15.2928932,4.63603897 L18.1213203,7.46446609 C18.9023689,8.24551468 18.9023689,9.51184464 18.1213203,10.2928932 L13.5766899,14.8375237 L13.5766899,14.8375237"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 6 - 6
src/pages/Home.vue

@@ -9,7 +9,7 @@
     <div class="container">
         <van-sticky>
             <div class="container-bg">
-                <div class="mytest"><img class="mytest" src="../static/imgs/home_top_bg@3x.png" alt="" /></div>
+                <div class="mytest"><img class="mytest" src="../static/imgs/home_top_bg3x.jpg" alt="" /></div>
                 <span>{{ seriesName }}</span>
                 <div class="box-top">
                     <div class="box-img" @click="showSeries('series')">
@@ -186,12 +186,12 @@ export default {
             }
 
             this.getData();
+        },
+        loginMethods() {
+            this.getSeries().then(() => {
+                this.getData();
+            });
         }
-    },
-    onLoad() {
-        this.getSeries().then(() => {
-            this.getData();
-        });
     }
 };
 </script>

+ 1 - 0
src/pages/confirmorder.vue

@@ -358,6 +358,7 @@ export default {
                 font-weight: bold;
                 color: #000000;
                 line-height: 20px;
+                min-width: 70px;
             }
             .box-buttom-p {
                 height: 22px;

+ 1 - 1
src/pages/details.vue

@@ -8,7 +8,7 @@
     <div class="container">
         <swiper style="height:335px;" :autoplay="true" :indicator-dots="true">
             <swiper-item>
-                <img src="../static/imgs/icon_lunbotu@3x..png" alt="" />
+                <img src="../static/imgs/icon_lunbotu3x..jpg" alt="" />
             </swiper-item>
             <swiper-item>
                 <img src="../static/imgs/1.jpeg" alt="" />

+ 14 - 1
src/pages/mine.vue

@@ -23,9 +23,11 @@
 
             <van-button type="primary" v-if="!userInfo" @click="login">点击授权登录</van-button>
 
-            <div class="info" v-else>
+            <div class="info" v-else @click="navigateTo('/pages/setting')">
                 <div class="text1">{{ userInfo.nickname }}</div>
                 <div class="text2" v-if="city">{{ city }}</div>
+
+                <img src="/native/svgs/icon_bianji.svg" class="edit" alt="" />
             </div>
 
             <van-image
@@ -161,6 +163,8 @@ export default {
 
 .info {
     margin-left: 16px;
+    position: relative;
+    flex-grow: 1;
     .text1 {
         font-size: 24px;
         font-weight: bold;
@@ -172,6 +176,15 @@ export default {
         color: #c8c9cc;
         line-height: 22px;
     }
+
+    .edit {
+        position: absolute;
+        right: 0;
+        top: 50%;
+        width: 24px;
+        height: 24px;
+        transform: translateY(-12px);
+    }
 }
 
 .invitation {

BIN
src/static/.DS_Store


BIN
src/static/imgs/.DS_Store


BIN
src/static/imgs/1.jpeg


BIN
src/static/imgs/2.jpeg


BIN
src/static/imgs/3.jpeg


BIN
src/static/imgs/4.jpeg


BIN
src/static/imgs/home_top_bg.png


BIN
src/static/imgs/home_top_bg3x.jpg


BIN
src/static/imgs/home_top_bg@3x.png


BIN
src/static/imgs/icon_dianpu@3x..png


BIN
src/static/imgs/icon_lunbotu3x..jpg


BIN
src/static/imgs/icon_lunbotu@3x..png


BIN
src/static/imgs/megalo_logo.png