Merge remote-tracking branch 'origin/master'

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/order-details.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/realName/realName.js.map

http/api.js

@@ -1,3 +1,3 @@
 export default {
-  baseUrl: "https://stock.szjixun.cn", //"https://warehouse.szjixun.cn", // https://stock.szjixun.cn
+  baseUrl: "https://warehouse.szjixun.cn", //"https://warehouse.szjixun.cn", // https://stock.szjixun.cn
 };

pages/cameraContext/cameraContext.vue

@@ -115,15 +115,17 @@ export default {
   height: 100vh;
 
   .logo {
+    width: 100%;
     height: 200rpx;
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
+    background: url("https://cdns.fontree.cn/fonchain-main/prod/image/1381bd18-2f0c-49f1-84f6-d3eceb94f7a7/artwork/6ef00a09-f663-451d-ae0c-0d00cf4068c5.png");
 
     .img {
-      width: 124rpx;
-      height: 72rpx;
+      width: 142rpx;
+      height: 60rpx;
     }
   }
 

pages/login/login.vue

@@ -110,12 +110,13 @@ export default {
   background: url("https://cdns.fontree.cn/fonchain-main/prod/image/1381bd18-2f0c-49f1-84f6-d3eceb94f7a7/artwork/6ef00a09-f663-451d-ae0c-0d00cf4068c5.png");
   height: 100vh;
   display: flex;
-  justify-content: center;
   align-items: center;
+  justify-content: center;
   flex-direction: column;
   .logo {
-    width: 237rpx;
-    height: 390rpx;
+    margin-top: 250rpx;
+    width: 398rpx;
+    height: 744rpx;
   }
   uni-button:after {
     border: 0px;

pages/realName/realName.vue

@@ -350,8 +350,8 @@ export default {
         align-items: center;
 
         .img {
-            width: 124rpx;
-            height: 72rpx;
+            width: 142rpx;
+            height: 60rpx;
         }
     }
 

unpackage/dist/dev/mp-weixin/pages/cameraContext/cameraContext.wxss

@@ -33,15 +33,17 @@
   height: 100vh;
 }
 .main .logo.data-v-0c0dc048 {
+  width: 100%;
   height: 200rpx;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
+  background: url("https://cdns.fontree.cn/fonchain-main/prod/image/1381bd18-2f0c-49f1-84f6-d3eceb94f7a7/artwork/6ef00a09-f663-451d-ae0c-0d00cf4068c5.png");
 }
 .main .logo .img.data-v-0c0dc048 {
-  width: 124rpx;
-  height: 72rpx;
+  width: 142rpx;
+  height: 60rpx;
 }
 .main .container.data-v-0c0dc048 {
   display: flex;

unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -31,13 +31,13 @@
   background: url("https://cdns.fontree.cn/fonchain-main/prod/image/1381bd18-2f0c-49f1-84f6-d3eceb94f7a7/artwork/6ef00a09-f663-451d-ae0c-0d00cf4068c5.png");
   height: 100vh;
   display: flex;
-  justify-content: center;
   align-items: center;
   flex-direction: column;
 }
 .main .logo.data-v-b237504c {
-  width: 237rpx;
-  height: 390rpx;
+  margin-top: 200rpx;
+  width: 398rpx;
+  height: 744rpx;
 }
 .main uni-button.data-v-b237504c:after {
   border: 0px;

unpackage/dist/dev/mp-weixin/pages/realName/realName.wxss

@@ -48,8 +48,8 @@
   align-items: center;
 }
 .main .logo .img.data-v-46c328a6 {
-  width: 124rpx;
-  height: 72rpx;
+  width: 142rpx;
+  height: 60rpx;
 }
 .main .container.data-v-46c328a6 {
   display: flex;

unpackage/dist/dev/mp-weixin/project.config.json

@@ -6,7 +6,7 @@
     },
     "setting": {
         "urlCheck": false,
-        "es6": false,
+        "es6": true,
         "postcss": false,
         "minified": false,
         "newFeature": true,
@@ -15,7 +15,8 @@
             "ignore": [],
             "disablePlugins": [],
             "outputPath": ""
-        }
+        },
+        "enhance": true
     },
     "compileType": "miniprogram",
     "libVersion": "3.1.0",