bug修改

buyer/src/pages/Merchant.vue

@@ -9,10 +9,12 @@
         <img :src="storeMsg.storeLogo" height="50" alt="">
         <div>
           <p>{{storeMsg.storeName || 'xx店铺'}}</p>
-          <p v-html="storeMsg.storeDesc"></p>
+          <p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p>
+        </div>
+        <div>
+          <span class="hover-pointer" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span>
+          <span style="width:80px" class="hover-pointer ml_10" @click="connectCs(storeMsg.yzfSign)"><Icon custom="icomoon icon-customer-service"  />联系客服</span>
         </div>
-        <div class="store-collect" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</div>
-        <span class="hover-pointer ml_10" @click="connectCs(storeMsg.yzfSign)"><Icon custom="icomoon icon-customer-service"  />联系客服</span>
       </div>
     </div>
     <div  class="store-category">
@@ -183,15 +185,25 @@ export default {
   position: relative;
   width: 100%;
   background-color: #666;
-  padding: 10px;
+  padding: 4px;
   color: #fff;
   >div{
     display: flex;
     width: 1200px;
     margin: 0 auto;
     align-items: center;
-    >div{
+
+    img {
+      width: 80px;
+    }
+
+    >div:nth-child(2){
       margin-left: 10px;
+      flex: 1;
+    }
+
+    >div:nth-child(3){
+      width: 200px;
     }
   }
   img {
@@ -202,14 +214,11 @@ export default {
   }
   p:nth-child(2){
     font-size: 14px;
+    max-height: 40px;
+    max-width: 400px;
   }
 }
-.store-collect{
+
-  margin-left: 750px!important;
-  &:hover{
-    cursor: pointer;
-  }
-}
 .store-category {
   background-color: #005aa0;
   color: #fff;

buyer/src/pages/forgetPassword.vue

@@ -1,15 +1,14 @@
 <template>
   <div class="login">
+    <div style="height:50px;"></div>
     <!-- 顶部logo -->
-    <div class="top-content">
     <div class="logo-box">
       <img
-          src="../assets/images/logo1.png"
+        :src="logoImg" width='150'
         @click="$router.push('/')"
       />
       <div>修改密码</div>
     </div>
-    </div>
     <div class="login-container">
         <!-- 验证手机号 -->
         <Form
@@ -119,6 +118,7 @@ export default {
   components: { Verify },
   data () {
     return {
+      logoImg: '', // logo图
       loading: false, // 加载状态
       loading1: false, // 第二步加载状态
       formFirst: { // 手机验证码表单
@@ -242,35 +242,23 @@ export default {
   },
   mounted () {
     this.$refs.formFirst.resetFields();
+    this.logoImg = this.Cookies.getItem('logo')
   },
   watch: {
   }
 };
 </script>
 <style scoped lang="scss">
-.login {
+.logo-box {
-  height: 100%;
+  width: 600px;
-}
-.top-content {
-  width: 100%;
-  height: 80px;
-  position: relative;
-  z-index: 1;
-  box-shadow: 0 1px 1px #ddd;
-  background-color: #fff;
-
-  .logo-box {
-    width: 80%;
-    max-width: 1200px;
   height: 80px;
   margin: 0 auto;
   display: flex;
   align-items: center;
   img {
-      width: 200px;
+    width: 150px;
     cursor: pointer;
   }
-  }
   div {
     font-size: 20px;
     margin-top: 10px;
@@ -278,22 +266,23 @@ export default {
 }
 
 .login-container {
+  border-top: 2px solid $theme_color;
   position: relative;
-  margin: 10px auto;
+  margin: 0 auto;
   width: 600px;
   background-color: #fff;
-  padding: 20px;
+  padding: 20px 150px;
   .login-btn{
     position: absolute;
     right: 20px;
-    top: 20px;
+    top: -45px;
   }
 }
 
 .verify-con{
   position: absolute;
-  left: 400px;
+  left: 140px;
-  top: 50px;
+  top: -30px;
   z-index: 10;
 }
 

buyer/src/pages/payment/thirdPay.vue

@@ -63,6 +63,7 @@ export default {
       this.num++;
       if (this.num >= 7) {
         clearInterval(this.interval);
+        this.interval = null;
       }
       let params = JSON.parse(JSON.stringify(this.$route.query));
       delete params.paymentMethod;
@@ -70,6 +71,7 @@ export default {
       payCallback(params).then(res => {
         if (res.result) {
           clearInterval(this.interval);
+          this.interval = null;
           this.$router.push({path: '/payDone', query: {orderType: this.$route.query.orderType}});
         }
       });

buyer/src/pages/shopEntry/shop-entry.vue

@@ -21,9 +21,6 @@
         <span v-if="storeDisable == 'CLOSED'">店铺已关闭，重申请联系管理员</span>
         <span v-if="storeDisable == 'REFUSED'">审核未通过,请修改资质信息，如有疑问请联系管理员</span>
       </div>
-      <Button @click="currentIndex = 0">上一步</Button>
-      <Button @click="currentIndex = 1">下一步</Button>
-      <Button @click="currentIndex = 2">第三步</Button>
       <Button v-if="currentIndex === 3" @click="$router.push('/')">返回</Button>
       <Button type="primary" @click='currentIndex = 0' v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
     </div>

buyer/src/plugins/request.js

@@ -116,6 +116,7 @@ async function refresh (error) {
         });
       },
       onCancel: () => {
+        router.go(0)
         Modal.remove();
       }
     });

seller/src/views/goods/goods-seller/goods.vue

@@ -36,7 +36,7 @@
             <DropdownItem name="uppers">批量上架</DropdownItem>
             <DropdownItem name="lowers">批量下架</DropdownItem>
             <DropdownItem name="deleteAll">批量删除</DropdownItem>
-            <!-- <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem> -->
+            <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem>
           </DropdownMenu>
         </Dropdown>
       </Row>