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

.gitignore

@@ -1,6 +1,5 @@
 .DS_Store
 node_modules/
-dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
@@ -12,5 +11,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.keystore
-unpackage/dist
-unpackage/resources
+unpackage/

api/activity.js

@@ -56,7 +56,7 @@ export function getSeckillList(time, data) {
  * 秒杀产品详情
  */
 export function getSeckillDetail(id) {
-  return request.get("/seckill/detail/" + id, {}, { login: false });
+  return request.get("/seckill/detail/" + id, {}, { login: true });
 }
 
 /**

assets/css/style.less

@@ -2008,6 +2008,9 @@ page {
   background-color: #f5f5f5;
   z-index: 5;
   top: 0;
+  /* #ifdef H5 */
+  top:calc(44px + env(safe-area-inset-top))
+  /* #endif */
 }
 
 .shoppingCart .labelNav .item .iconfont {
@@ -2028,6 +2031,9 @@ page {
   z-index: 5;
   top: 0.76*100rpx;
   border-bottom: 1px solid #f5f5f5;
+  /* #ifdef H5 */
+  top:calc(44px + env(safe-area-inset-top) + 76rpx)
+  /* #endif  */
 }
 
 .shoppingCart .nav .administrate {
@@ -2221,6 +2227,8 @@ page {
   bottom: 0;
   padding: 0 0.3*100rpx;
   border-top: 1px solid #eee;
+  
+  
 }
 
 .shoppingCart .iphonex-footer {
@@ -7550,15 +7558,11 @@ page {
   position: fixed;
   left: 0;
   right: 0;
-
-  // #ifdef H5
-  top: 88rpx;
-  // #endif
-
-  // #ifndef H5
   top: 0;
-  // #endif
 
+    /* #ifdef H5 */
+    top:calc(44px + env(safe-area-inset-top));
+    /* #endif */
   z-index: 9;
   // border-bottom: 1px solid #555;
 }
@@ -7596,6 +7600,10 @@ page {
   overflow-y: auto;
   overflow-x: hidden;
   overflow-scrolling: touch;
+  
+   /* #ifdef H5 */
+   top:calc(44px + env(safe-area-inset-top) + 88rpx);
+   /* #endif */
 }
 
 .productSort .aside .item {
@@ -9305,7 +9313,7 @@ rich-text {
     .original {
       font-size: 20rpx;
       font-weight: 400;
-      text-decoration: line-through;
+      // text-decoration: line-through;
       color: rgba(153, 153, 153, 1);
       margin-left: 14rpx;
     }

pages.json

@@ -348,7 +348,7 @@
 		{
 			"path": "pages/orderAdmin/OrderCancellation/index",
 			"style": {
-				"navigationBarTitleText": "商家取消订单"
+				"navigationBarTitleText": "商家核销订单"
 			}
 		},
 		{
@@ -424,7 +424,7 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
 		"navigationStyle": "default"
-		
+
 	},
 	"tabBar": {
 		"color": "#282828",

pages/home/components/Banner.vue

@@ -40,7 +40,7 @@
                 // 获取轮播图
                 let item = this.detail[this.swiperCurrent];
                 // 获取轮播图颜色
-                let bgcolor = item.bgcolor;
+                let bgcolor = item.color;
                 // 颜色不存在
                 if (bgcolor === '') {
                     that.$set(item, 'bgcolor', '#c40414');

pages/shop/GoodsCon/index.vue

@@ -636,7 +636,7 @@
       setCollect: function () {
         let that = this,
           id = that.storeInfo.id,
-          category = "product";
+          category = "collect";
         if (that.storeInfo.userCollect) {
           getCollectDel(id, category).then(function () {
             that.storeInfo.userCollect = !that.storeInfo.userCollect;
@@ -753,7 +753,7 @@
       },
       setOpenShare: function () {
         var data = this.storeInfo;
-        var href = location.href;
+        var href =  this.location.href;
         if (this.$deviceType == "weixin") {
           if (this.isLogin) {
             getUserInfo().then((res) => {

pages/shop/ShoppingCart/index.vue

@@ -517,5 +517,8 @@
 <style lang="less">
   .footer-h5 {
     bottom: 50px
+  }
+  .shoppingCart{
+	  position: relative;
   }
 </style>

pages/user/promotion/Poster/index.vue

@@ -76,7 +76,7 @@
           }
         );
       },
-      downloadIamge: function (imgsrc, name) {
+      downloadIamge (imgsrc, name) {
         var that = this;
         this.isDown = true;
         var downloadUrl = imgsrc;
@@ -101,7 +101,7 @@
               wx.authorize({
                 scope: "scope.writePhotosAlbum",
                 success() {
-                  that.downloadImage(downloadUrl);
+                  that.downloadFile(downloadUrl);
                 },
                 fail() {
                   // 用户拒绝了授权
@@ -113,7 +113,7 @@
                 }
               });
             } else {
-              that.downloadImage(downloadUrl);
+              that.downloadFile(downloadUrl);
             }
           },
           fail(res) {
@@ -126,6 +126,23 @@
           this.info[this.activeIndex].wap_poster,
           "poster" + this.activeIndex
         );
+      },
+      downloadFile(url){
+        uni.downloadFile({
+          url,
+          fail: function(res) {
+            uni.showModal({
+            title: "提示",
+            content: "保存失败"
+          });
+          },
+          success: function(res) {
+            uni.showModal({
+            title: "提示",
+            content: "保存成功"
+          });
+          }
+        });
       }
     }
   };

unpackage/debug/.ios.ins

@@ -1 +0,0 @@
-installed

unpackage/resources/__UNI__C7A519E/www/__uniappview.html

@@ -1,28 +0,0 @@
-<!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>

unpackage/resources/__UNI__C7A519E/www/app-config.js

@@ -1 +0,0 @@
-(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()})([]);

unpackage/resources/__UNI__C7A519E/www/manifest.json

@@ -1 +0,0 @@
-{"@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":false,"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.8.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#282828","selectedColor":"#eb3729","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"}}