Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -178,7 +178,9 @@ gulp.task('font', () => {
 gulp.task('postcss', ['assets'], () => {
 gulp.task('postcss', ['assets'], () => {
     return gulp.src('scss/index.css')
     return gulp.src('scss/index.css')
         .pipe(postcss(postcssPlugin(env.pro)))
         .pipe(postcss(postcssPlugin(env.pro)))
-        .pipe(cssnano())
+        .pipe(cssnano({
+            safe: true
+        }))
         .pipe(gulp.dest(dist.css));
         .pipe(gulp.dest(dist.css));
 });
 });
 
 

@@ -10,6 +10,7 @@ var $ = require('jquery'),
     interceptClick = require('common/intercept-click');
     interceptClick = require('common/intercept-click');
 
 
 $(() => {
 $(() => {
+    setTimeout(() => {
         yoho.addNativeMethod('saveFeedback', function() {
         yoho.addNativeMethod('saveFeedback', function() {
             var suggestText = $('#suggest-textarea').val(),
             var suggestText = $('#suggest-textarea').val(),
                 textReg = /\S+/;
                 textReg = /\S+/;
@@ -51,4 +52,5 @@ $(() => {
             header: header,
             header: header,
             url: location.origin + '/me/feedback'
             url: location.origin + '/me/feedback'
         });
         });
+    }, 200);
 });
 });

@@ -2,13 +2,14 @@ var yoho = require('yoho');
 var $ = require('jquery');
 var $ = require('jquery');
 const util = require('common/util');
 const util = require('common/util');
 
 
-if (!yoho.isLogin) {
+$(() => {
+    if (!yoho.isLogin) {
         $('.auth').addClass('no-intercept');
         $('.auth').addClass('no-intercept');
         $('.auth').on('click', function() {
         $('.auth').on('click', function() {
             yoho.goLogin();
             yoho.goLogin();
             return false;
             return false;
         });
         });
-} else {
+    } else {
         // 地址管理
         // 地址管理
         $('#address').on('click', function() {
         $('#address').on('click', function() {
             yoho.goAddress({
             yoho.goAddress({
@@ -16,15 +17,14 @@ if (!yoho.isLogin) {
             });
             });
             return false;
             return false;
         });
         });
-}
+    }
 
 
-// 系统设置
-$('#setting').on('click', function() {
+    // 系统设置
+    $('#setting').on('click', function() {
         yoho.goSetting();
         yoho.goSetting();
         return false;
         return false;
-});
+    });
 
 
-$(() => {
     yoho.showLoading(false);
     yoho.showLoading(false);
     util.visibilitychange();
     util.visibilitychange();
 });
 });

@@ -95,6 +95,11 @@ body {
             &:last-child {
             &:last-child {
                 border-bottom: 0 none;
                 border-bottom: 0 none;
             }
             }
+
+            a {
+                display: flex;
+                width: 100%;
+            }
         }
         }
 
 
         .img-box {
         .img-box {

@@ -15,6 +15,7 @@
         <div class="order-goods">
         <div class="order-goods">
             <ul>
             <ul>
                 <li class="goods-info" v-for="product in order.orderGoods">
                 <li class="goods-info" v-for="product in order.orderGoods">
+                    <a :href="product | goodsUrl 'collection'">
                         <div class="img-box">
                         <div class="img-box">
                             <img v-bind:src="product.goodsImage | resize 49 65">
                             <img v-bind:src="product.goodsImage | resize 49 65">
                             <label v-if="product.goodsType === 'gift'">赠品</label>
                             <label v-if="product.goodsType === 'gift'">赠品</label>
@@ -31,6 +32,7 @@
                             <p>&yen;{{product.goodsPrice}}</p>
                             <p>&yen;{{product.goodsPrice}}</p>
                             <p>×{{product.buyNumber}}</p>
                             <p>×{{product.buyNumber}}</p>
                         </div>
                         </div>
+                    </a>
                 </li>
                 </li>
             </ul>
             </ul>
         </div>
         </div>
@@ -209,6 +211,8 @@
                 });
                 });
             },
             },
             confirmGoods(code) {
             confirmGoods(code) {
+                Modal.confirm('', '确认删除订单？', function() {
+                    this.hide();
                     $.ajax({
                     $.ajax({
                         url: '/me/confirmReceive',
                         url: '/me/confirmReceive',
                         type: 'post',
                         type: 'post',
@@ -224,6 +228,7 @@
                     }).fail(() => {
                     }).fail(() => {
                         tip('操作失败');
                         tip('操作失败');
                     });
                     });
+                });
             },
             },
             goBuy(order) {
             goBuy(order) {
                 yohoAPI.goPay({
                 yohoAPI.goPay({

@@ -206,6 +206,8 @@
                 });
                 });
             },
             },
             confirmGoods(code) {
             confirmGoods(code) {
+                Modal.confirm('', '确认收货？', function() {
+                    this.hide();
                     $.ajax({
                     $.ajax({
                         url: '/me/confirmReceive',
                         url: '/me/confirmReceive',
                         type: 'post',
                         type: 'post',
@@ -221,6 +223,7 @@
                     }).fail(() => {
                     }).fail(() => {
                         tip('操作失败');
                         tip('操作失败');
                     });
                     });
+                });
             },
             },
             goBuy(order) {
             goBuy(order) {
                 yohoAPI.goPay({
                 yohoAPI.goPay({