Merge branch 'master' of https://git.dayouqiantu.cn/uniapp/yshop-uniapp

2020-05-17 00:42:53 +08:00
parent b21dfb22d8 d704426d6a
commit 81e65d9974
179 changed files with 65 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,4 @@
 .DS_Store
-unpackage/
 node_modules/
 dist/
 npm-debug.log*
--- a/unpackage/res/icon/logo-white.png
+++ b/unpackage/res/icon/logo-white.png
--- a/unpackage/res/icon/logo.png
+++ b/unpackage/res/icon/logo.png
--- a/unpackage/res/icons/1024x1024.png
+++ b/unpackage/res/icons/1024x1024.png
--- a/unpackage/res/icons/120x120.png
+++ b/unpackage/res/icons/120x120.png
--- a/unpackage/res/icons/144x144.png
+++ b/unpackage/res/icons/144x144.png
--- a/unpackage/res/icons/152x152.png
+++ b/unpackage/res/icons/152x152.png
--- a/unpackage/res/icons/167x167.png
+++ b/unpackage/res/icons/167x167.png
--- a/unpackage/res/icons/180x180.png
+++ b/unpackage/res/icons/180x180.png
--- a/unpackage/res/icons/192x192.png
+++ b/unpackage/res/icons/192x192.png
--- a/unpackage/res/icons/20x20.png
+++ b/unpackage/res/icons/20x20.png
--- a/unpackage/res/icons/29x29.png
+++ b/unpackage/res/icons/29x29.png
--- a/unpackage/res/icons/40x40.png
+++ b/unpackage/res/icons/40x40.png
--- a/unpackage/res/icons/58x58.png
+++ b/unpackage/res/icons/58x58.png
--- a/unpackage/res/icons/60x60.png
+++ b/unpackage/res/icons/60x60.png
--- a/unpackage/res/icons/72x72.png
+++ b/unpackage/res/icons/72x72.png
--- a/unpackage/res/icons/76x76.png
+++ b/unpackage/res/icons/76x76.png
--- a/unpackage/res/icons/80x80.png
+++ b/unpackage/res/icons/80x80.png
--- a/unpackage/res/icons/87x87.png
+++ b/unpackage/res/icons/87x87.png
--- a/unpackage/res/icons/96x96.png
+++ b/unpackage/res/icons/96x96.png
--- a/unpackage/res/splash/1024+1024.png
+++ b/unpackage/res/splash/1024+1024.png
--- a/unpackage/res/splash/1080+1882.png
+++ b/unpackage/res/splash/1080+1882.png
--- a/unpackage/res/splash/1125+2436.png
+++ b/unpackage/res/splash/1125+2436.png
--- a/unpackage/res/splash/1142+2208.png
+++ b/unpackage/res/splash/1142+2208.png
--- a/unpackage/res/splash/1242+2688.png
+++ b/unpackage/res/splash/1242+2688.png
--- a/unpackage/res/splash/480+762.png
+++ b/unpackage/res/splash/480+762.png
--- a/unpackage/res/splash/640+1136.png
+++ b/unpackage/res/splash/640+1136.png
--- a/unpackage/res/splash/640+960.png
+++ b/unpackage/res/splash/640+960.png
--- a/unpackage/res/splash/720+1242.png
+++ b/unpackage/res/splash/720+1242.png
--- a/unpackage/res/splash/750+1334.png
+++ b/unpackage/res/splash/750+1334.png
--- a/unpackage/res/splash/828+1792.png
+++ b/unpackage/res/splash/828+1792.png
--- a/unpackage/resources/UNIC7A519E/www/__uniappchooselocation.js
+++ b/unpackage/resources/UNIC7A519E/www/__uniappchooselocation.js
--- a/unpackage/resources/UNIC7A519E/www/__uniappes6.js
+++ b/unpackage/resources/UNIC7A519E/www/__uniappes6.js
--- a/unpackage/resources/UNIC7A519E/www/__uniappopenlocation.js
+++ b/unpackage/resources/UNIC7A519E/www/__uniappopenlocation.js
--- a/unpackage/resources/UNIC7A519E/www/__uniapppicker.js
+++ b/unpackage/resources/UNIC7A519E/www/__uniapppicker.js
--- a/unpackage/resources/UNIC7A519E/www/__uniappquill.js
+++ b/unpackage/resources/UNIC7A519E/www/__uniappquill.js
--- a/unpackage/resources/UNIC7A519E/www/__uniappquillimageresize.js
+++ b/unpackage/resources/UNIC7A519E/www/__uniappquillimageresize.js
--- a/unpackage/resources/UNIC7A519E/www/__uniappscan.js
+++ b/unpackage/resources/UNIC7A519E/www/__uniappscan.js
--- a/unpackage/resources/UNIC7A519E/www/__uniappsuccess.png
+++ b/unpackage/resources/UNIC7A519E/www/__uniappsuccess.png
--- a/unpackage/resources/UNIC7A519E/www/__uniappview.html
+++ b/unpackage/resources/UNIC7A519E/www/__uniappview.html
@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      document.addEventListener('DOMContentLoaded', function() {
+          document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
+      })
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>
--- a/unpackage/resources/UNIC7A519E/www/app-config-service.js
+++ b/unpackage/resources/UNIC7A519E/www/app-config-service.js
--- a/unpackage/resources/UNIC7A519E/www/app-config.js
+++ b/unpackage/resources/UNIC7A519E/www/app-config.js
@ -0,0 +1 @@
+(function(e){function r(r){for(var n,i,l=r[0],f=r[1],a=r[2],c=0,s=[];c<l.length;c++)i=l[c],o[i]&&s.push(o[i][0]),o[i]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);p&&p(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var f=t[l];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/";var l=this["webpackJsonp"]=this["webpackJsonp"]||[],f=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=f;t()})([]);
--- a/unpackage/resources/UNIC7A519E/www/app-service.js
+++ b/unpackage/resources/UNIC7A519E/www/app-service.js
--- a/unpackage/resources/UNIC7A519E/www/app-view.js
+++ b/unpackage/resources/UNIC7A519E/www/app-view.js
--- a/unpackage/resources/UNIC7A519E/www/manifest.json
+++ b/unpackage/resources/UNIC7A519E/www/manifest.json
@ -0,0 +1 @@
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__C7A519E","name":"yshopmall","version":{"name":"1.0.0","code":1},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Share":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","compilerVersion":3,"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"2.6.8","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#282828","selectedColor":"#00c17b","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/home/index","iconPath":"static/icon-home.png","selectedIconPath":"static/icon-home-hot.png","text":"首页"},{"pagePath":"pages/shop/GoodsClass/index","iconPath":"static/icon-class.png","selectedIconPath":"static/icon-class-hot.png","text":"分类"},{"pagePath":"pages/shop/ShoppingCart/index","iconPath":"static/icon-cart.png","selectedIconPath":"static/icon-cart-hot.png","text":"购物车"},{"pagePath":"pages/user/User/index","iconPath":"static/icon-user.png","selectedIconPath":"static/icon-user-hot.png","text":"我的"}]},"launch_path":"__uniappview.html"}}
--- a/unpackage/resources/UNIC7A519E/www/static/icon-cart-hot.png
+++ b/unpackage/resources/UNIC7A519E/www/static/icon-cart-hot.png
--- a/unpackage/resources/UNIC7A519E/www/static/icon-cart.png
+++ b/unpackage/resources/UNIC7A519E/www/static/icon-cart.png
--- a/unpackage/resources/UNIC7A519E/www/static/icon-class-hot.png
+++ b/unpackage/resources/UNIC7A519E/www/static/icon-class-hot.png
--- a/unpackage/resources/UNIC7A519E/www/static/icon-class.png
+++ b/unpackage/resources/UNIC7A519E/www/static/icon-class.png
--- a/unpackage/resources/UNIC7A519E/www/static/icon-home-hot.png
+++ b/unpackage/resources/UNIC7A519E/www/static/icon-home-hot.png
--- a/unpackage/resources/UNIC7A519E/www/static/icon-home.png
+++ b/unpackage/resources/UNIC7A519E/www/static/icon-home.png
--- a/unpackage/resources/UNIC7A519E/www/static/icon-user-hot.png
+++ b/unpackage/resources/UNIC7A519E/www/static/icon-user-hot.png
--- a/unpackage/resources/UNIC7A519E/www/static/icon-user.png
+++ b/unpackage/resources/UNIC7A519E/www/static/icon-user.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/404.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/404.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/accountBg.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/accountBg.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/address.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/address.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/alter.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/alter.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/angle.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/angle.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/balance.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/balance.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/bargain.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/bargain.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/brass.jpg
+++ b/unpackage/resources/UNIC7A519E/www/static/images/brass.jpg
--- a/unpackage/resources/UNIC7A519E/www/static/images/brass.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/brass.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/bronze.jpg
+++ b/unpackage/resources/UNIC7A519E/www/static/images/bronze.jpg
--- a/unpackage/resources/UNIC7A519E/www/static/images/bronze.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/bronze.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/calendar_all.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/calendar_all.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/collection.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/collection.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/coupon-window.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/coupon-window.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/coupon-window2.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/coupon-window2.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/coupon.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/coupon.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/coupon1.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/coupon1.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/coupon2.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/coupon2.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/customer.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/customer.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/del.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/del.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/dfh.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/dfh.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/dfk.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/dfk.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/diamonds.jpg
+++ b/unpackage/resources/UNIC7A519E/www/static/images/diamonds.jpg
--- a/unpackage/resources/UNIC7A519E/www/static/images/diamonds.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/diamonds.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/down.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/down.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/dpj.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/dpj.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/dsh.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/dsh.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/enter.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/enter.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/examine.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/examine.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/extension.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/extension.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/face.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/face.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/figure.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/figure.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/gift.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/gift.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/gold.jpg
+++ b/unpackage/resources/UNIC7A519E/www/static/images/gold.jpg
--- a/unpackage/resources/UNIC7A519E/www/static/images/gold.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/gold.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/group.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/group.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/h5.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/h5.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/horn.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/horn.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/index-bg.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/index-bg.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/integralbg.jpg
+++ b/unpackage/resources/UNIC7A519E/www/static/images/integralbg.jpg
--- a/unpackage/resources/UNIC7A519E/www/static/images/keyboard.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/keyboard.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/left.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/left.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/light.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/light.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/line.jpg
+++ b/unpackage/resources/UNIC7A519E/www/static/images/line.jpg
--- a/unpackage/resources/UNIC7A519E/www/static/images/ling.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/ling.png
--- a/unpackage/resources/UNIC7A519E/www/static/images/live-logo.gif
+++ b/unpackage/resources/UNIC7A519E/www/static/images/live-logo.gif
--- a/unpackage/resources/UNIC7A519E/www/static/images/lock.png
+++ b/unpackage/resources/UNIC7A519E/www/static/images/lock.png
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				(function(e){function r(r){for(var n,i,l=r[0],f=r[1],a=r[2],c=0,s=[];c<l.length;c++)i=l[c],o[i]&&s.push(o[i][0]),o[i]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);p&&p(r);while(s.length)s.shift()();return u.push.apply(u,a\|\|[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var f=t[l];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)\|\|Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/";var l=this["webpackJsonp"]=this["webpackJsonp"]\|\|[],f=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=f;t()})([]);
				`@ -0,0 +1 @@`
				{"@platforms":["android","iPhone","iPad"],"id":"__UNI__C7A519E","name":"yshopmall","version":{"name":"1.0.0","code":1},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Share":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","compilerVersion":3,"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"2.6.8","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#282828","selectedColor":"#00c17b","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/home/index","iconPath":"static/icon-home.png","selectedIconPath":"static/icon-home-hot.png","text":"首页"},{"pagePath":"pages/shop/GoodsClass/index","iconPath":"static/icon-class.png","selectedIconPath":"static/icon-class-hot.png","text":"分类"},{"pagePath":"pages/shop/ShoppingCart/index","iconPath":"static/icon-cart.png","selectedIconPath":"static/icon-cart-hot.png","text":"购物车"},{"pagePath":"pages/user/User/index","iconPath":"static/icon-user.png","selectedIconPath":"static/icon-user-hot.png","text":"我的"}]},"launch_path":"__uniappview.html"}}