Merge branch 'dev' into dev-AI-v5

components/ProductWindow.vue

@@ -75,7 +75,7 @@
       <view class="v12-px-2 v12-mt-3" v-if="showOk">
         <u-button 
           shape="circle" 
-          color="#C52733" 
+          :color="(attr.productSelect.stock === 0 && attr.cartAttr) ? '#9D9D9D' : '#C52733'" 
           @click="$emit('ok')"
           :disabled="(attr.productSelect.stock === 0 && attr.cartAttr)"
         >{{ okText }}</u-button>
@@ -83,7 +83,7 @@
       <view class="v12-px-2 v12-mt-3" v-if="isGift">
         <u-button 
           shape="circle" 
-          color="#C52733" 
+          :color="(attr.productSelect.stock === 0 && attr.cartAttr) ? '#9D9D9D' : '#C52733'" 
           @click="$emit('gift')"
           :disabled="(attr.productSelect.stock === 0 && attr.cartAttr)"
         >送给朋友</u-button>
@@ -255,6 +255,15 @@ export default {
 }
 </script>
 <style scope>
+  .btn-car-disabled {
+    border: 2rpx solid #9D9D9D !important;
+    color: #9D9D9D !important;
+  }
+
+  .btn-buy-disabled {
+    background: #9D9D9D !important;
+    color: #FFFFFF !important;
+  }
   .itemn{
     margin: 28rpx 0 0 34rpx !important;
     width: auto;

pages/shop/GoodsCon/index.vue

@@ -1872,8 +1872,8 @@ export default {
   }
 
   .btn-car-disabled {
-    border: 2rpx solid #707070;
-    color: #707070;
+    border: 2rpx solid #9D9D9D !important;
+    color: #9D9D9D !important;
   }
 
   .btn-buy {
@@ -1886,7 +1886,8 @@ export default {
   }
 
   .btn-buy-disabled {
-    background: #9D9D9D;
+    background: #9D9D9D !important;
+    color: #FFFFFF !important;
   }
 }
 

utils/index.js

@@ -379,7 +379,7 @@ export const login = loginInfo => {
                                             })
                                     })
                                     .catch(error => {
-                                        reject('登录接口调用失败')
+                                        reject('请联系管理员')
                                     })
                             } else {
                                 reject('用户未授权')
@@ -413,7 +413,7 @@ export const login = loginInfo => {
                                                 })
                                         })
                                         .catch(error => {
-                                            reject('登录接口调用失败')
+                                            reject('请联系管理员')
                                         })
                                 },
                                 fail() {
@@ -423,7 +423,7 @@ export const login = loginInfo => {
                         }
                     },
                     fail() {
-                        reject('调用登录接口失败')
+                        reject('请联系管理员')
                     },
                 })
             })