Merge remote-tracking branch 'origin/yuenan' into yuenan

3 years ago · 339340199e
--- a/addons/unishop/uniapp/uni-shop/.hbuilderx/launch.json
+++ b/addons/unishop/uniapp/uni-shop/.hbuilderx/launch.json
@@ -0,0 +1,11 @@
 { // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
    "version": "0.0",
    "configurations": [{
            "type": "uniCloud",
            "default": {
                "launchtype": "remote"
            }
        }
    ]
 }
--- a/addons/unishop/uniapp/uni-shop/pages/public/login.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/public/login.vue
@@ -42,7 +42,7 @@
 			<!-- #endif -->
 			
 			<view class="forget-section">
 				<view><label @click="register('resetpwd')">忘记密码</label> 
 				<view><label @click="register('resetpwd')">忘记密码</label> </view>
 				<!-- - <label @click="register('register')">立马注册</label></view> -->
 			</view>
 			
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>宜家自购商城</title><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
 			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.59366e29.js></script><script src=/h5/static/js/index.59c4e445.js></script></body></html>
 			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.3df5810f.js></script><script src=/h5/static/js/index.e6b193d4.js></script></body></html>
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.3df5810f.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.3df5810f.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.59366e29.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.59366e29.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.e6b193d4.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.e6b193d4.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.1f6df729.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.1f6df729.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.e6f87c43.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.e6f87c43.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-addressManage.13f2198d.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-addressManage.13f2198d.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-addressManage.cea10461.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-addressManage.cea10461.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.bb93b871.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.bb93b871.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.eaddb64b.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.eaddb64b.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.407da11b.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.407da11b.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.6b35d530.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.6b35d530.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-login.759bfc8b.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-login.759bfc8b.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-login.dac5b645.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-login.dac5b645.js