weixin_52219567 пре 1 дан
родитељ
комит
49004ed98d

+ 2 - 1
src/layout/components/foot.vue

@@ -76,6 +76,7 @@
       width: 100%;
       margin: 0 auto;
       display: flex;
+      justify-content: center;
 
       .head-left {
         padding-right: 116px;
@@ -100,7 +101,7 @@
       }
 
       .head-right {
-        flex: 1;
+        // flex: 1;
         padding-top: 44px;
 
         .info-bos {

+ 4 - 2
src/views/enterprise/securitySetting/resetPassword.vue

@@ -224,6 +224,7 @@ const handleSubmit = async () => {
   background: #f5f5f5;
   min-height: 100%;
   padding: 0;
+  width: 100%;
 }
 
 // 面包屑
@@ -255,8 +256,9 @@ const handleSubmit = async () => {
 
 // 主体内容
 .reset-content {
-  max-width: 800px;
-  margin: 30px auto;
+  width: 100%;
+  // max-width: 800px;
+  margin: 15px auto;
   padding: 30px 40px;
   background: #fff;
   border-radius: 4px;

+ 7 - 3
src/views/item/index.vue

@@ -179,7 +179,9 @@
           </div>
         </div>
         <div class="bnt-bos flex-row-start">
-          <el-button :disabled="dataInfo.allStock > 0 ? false : true" class="btn" type="primary" @click="onCart">加入购物车</el-button>
+          <el-button :disabled="dataInfo.allStock > 0 && dataInfo.productStatus == 1 ? false : true" class="btn" type="primary" @click="onCart"
+            >加入购物车</el-button
+          >
           <span v-if="dataInfo.allStock <= 0" class="btn-text">(库存不足)</span>
         </div>
       </div>
@@ -235,7 +237,7 @@
 </template>
 
 <script setup lang="ts">
-import { getToken } from '@/utils/auth';
+import Cookies from 'js-cookie';
 import { regionData } from 'element-china-area-data';
 import { onPath } from '@/utils/siteConfig';
 import figure from '@/assets/images/figure.png';
@@ -267,6 +269,7 @@ const recommendList = ref<any>([]);
 const num = ref<any>(1);
 const carouselIndex = ref<any>(0);
 const productNo = ref<any>(null);
+const token = Cookies.get('Authorization');
 
 watch(route, () => {
   initData();
@@ -294,7 +297,8 @@ const initData = () => {
     getInfoId();
   }
 
-  if (getToken()) {
+  if (token) {
+    console.log('收藏');
     getCollection();
     // 浏览记录
     addProductBrowsingHistory(id.value).then((res) => {});

+ 3 - 1
src/views/payc/index.vue

@@ -110,13 +110,15 @@ const handleCancelOrder = () => {
       padding-top: 20px;
     }
     .pay-bos {
+      // width: calc(100% - 40px);
       width: 100%;
       height: 230px;
       border: 1px solid #e5e7eb;
       margin-top: 30px;
       padding: 30px 0 20px 0;
       .pay-box {
-        width: 1180px;
+        width: calc(100% - 20px);
+        // width: 100%;
         border-bottom: 1px solid #dfe9f1;
         margin: 0 10px;
         padding-bottom: 20px;

+ 10 - 6
src/views/trad/index.vue

@@ -65,8 +65,8 @@
         <el-input
           :maxlength="50"
           v-model="form.purchaseReason"
-          style="width: 340px"
-          :autosize="{ minRows: 2, maxRows: 4 }"
+          style="width: 600px"
+          :autosize="{ minRows: 4, maxRows: 8 }"
           type="textarea"
           show-word-limit
           placeholder="请输入采购事由"
@@ -80,8 +80,8 @@
         <el-input
           :maxlength="50"
           v-model="form.remark"
-          style="width: 340px"
-          :autosize="{ minRows: 2, maxRows: 4 }"
+          style="width: 600px"
+          :autosize="{ minRows: 4, maxRows: 8 }"
           type="textarea"
           show-word-limit
           placeholder="请输入订单备注"
@@ -380,7 +380,9 @@ const disabledDate = (date: Date) => {
   width: 100%;
   background-color: #ffffff;
   .create-bos {
-    width: 1200px;
+    width: 100%;
+    min-width: 1200px;
+    max-width: 1500px;
     margin: 0 auto;
     .create-title {
       font-size: 16px;
@@ -388,7 +390,9 @@ const disabledDate = (date: Date) => {
       padding-top: 16px;
     }
     .create-head {
-      width: 1200px;
+      width: 100%;
+      min-width: 1200px;
+      max-width: 1500px;
       height: 40px;
       background: #f9fafb;
       margin-top: 10px;