0115

.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=http://192.168.50.104:8080
+VUE_APP_BASE_URL=https://www.imttech.cn
 VUE_APP_PHONE=862160797117
 VUE_APP_EMAIL=imttech@itoc.com.cn
 VUE_APP_PRODUCTSTATUS=PENDING_REVIEW,NOW_ON_SHELF

project.config.json

@@ -114,6 +114,13 @@
                     "query": "",
                     "scene": null
                 },
+                {
+                    "id": -1,
+                    "name": "清单",
+                    "pathName": "pagesMine/OrderDetail",
+                    "query": "id=32117",
+                    "scene": null
+                },
                 {
                     "id": -1,
                     "name": "新闻资讯",

src/components/News/Grid.vue

@@ -1,36 +1,42 @@
 <template>
     <div class="news-grid news" @click="navigateTo('/pagesNews/Detail?id=' + info.id, false)">
         <van-image :src="info.img" fit="cover" :height="180" custom-class="my-img" />
-        <div class="text1">{{ info.title }}</div>
-        <div class="activity" v-if="isActivity">
-            <div class="activity-info">
-                <van-icon name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/iocn_didian.png" />
-                <div class="text">{{ info.address }}</div>
-            </div>
-            <div class="activity-info">
-                <van-icon name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/iocn_shijian.png" />
-                <div class="text">{{ info.date }}</div>
-            </div>
+        <div class="news-grid-info">
+            <div class="text1">{{ info.title }}</div>
+            <div class="activity" v-if="isActivity">
+                <div class="activity-info">
+                    <van-icon name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/iocn_didian.png" />
+                    <div class="text">{{ info.address }}</div>
+                </div>
+                <div class="activity-info">
+                    <van-icon name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/iocn_shijian.png" />
+                    <div class="text">{{ info.date }}</div>
+                </div>
 
-            <div class="btn" v-if="info.del">
-                <van-button :color="$colors.warn" :radius="4" disabled>活动已取消</van-button>
-            </div>
+                <div class="btn" v-if="info.del">
+                    <van-button :color="$colors.warn" :radius="4" disabled>活动已取消</van-button>
+                </div>
 
-            <div class="btn" v-else>
-                <van-button
-                    class="cancel"
-                    type="primary"
-                    v-if="activityId && !isEnd"
-                    color="#565B66"
-                    plain
-                    :radius="4"
-                    @click.stop="cancel"
-                    >取消报名</van-button
-                >
+                <div class="btn" v-else>
+                    <van-button
+                        class="cancel"
+                        type="primary"
+                        v-if="activityId && !isEnd"
+                        color="#565B66"
+                        plain
+                        :radius="4"
+                        @click.stop="cancel"
+                        >取消报名</van-button
+                    >
+
+                    <van-button :color="$colors.warn" :radius="4" :disabled="isEnd" :readonly="userActivity">{{
+                        isEnd ? $t('bao-ming-jie-shu') : activityId ? '报名中' : '活动报名'
+                    }}</van-button>
+                </div>
+            </div>
 
-                <van-button :color="$colors.warn" :radius="4" :disabled="isEnd" :readonly="userActivity">{{
-                    isEnd ? $t('bao-ming-jie-shu') : activityId ? '报名中' : '活动报名'
-                }}</van-button>
+            <div class="time" v-if="info.type === 'NEW_PRODUCT_RELEASE'">
+                {{ info.auditTime }}
             </div>
         </div>
     </div>
@@ -83,8 +89,10 @@ export default {
     border-radius: 4px;
     overflow: hidden;
     background-color: @bgw;
-    .text1 {
+    .news-grid-info {
         padding: 12px;
+    }
+    .text1 {
         display: -webkit-box;
         -webkit-box-orient: vertical;
         -webkit-line-clamp: 2;
@@ -94,6 +102,13 @@ export default {
         line-height: 24px;
     }
 
+    .time {
+        font-size: 12px;
+        color: #acb3bf;
+        line-height: 22px;
+        margin-top: 6px;
+    }
+
     // &:active {
     //     background-color: darken(#fff, 10);
     // }
@@ -101,6 +116,7 @@ export default {
     .activity {
         display: flex;
         flex-direction: column;
+        padding: 8px 0 0;
 
         .activity-info {
             display: flex;
@@ -132,7 +148,6 @@ export default {
             margin-left: 10px;
         }
     }
-    padding: 0 16px 16px 12px;
 }
 
 .cancel {

src/mixins/form.js

@@ -1,10 +1,8 @@
 export default {
-    data() {
-			rule
-		},
-    computed:{
-			canNext(){
-				return true;
-			}
-		}
+    data() {},
+    computed: {
+        canNext() {
+            return true;
+        }
+    }
 };

src/pagesHome/Edit.vue

@@ -346,4 +346,8 @@ export default {
     //     background-color: darken(#fff, 5);
     // }
 }
+
+.van-cell {
+    --cell-right-icon-color: #ccd0dc;
+}
 </style>

src/pagesMine/OrderDetail.vue

@@ -9,7 +9,7 @@
             <h3>{{ $t('xuan-ze-xin-zeng-qing-dan-lei-xing') }}</h3>
             <div class="page-input" @click="chooseType">
                 <span class="text">{{ typeName }}</span>
-                <van-icon v-if="!form.id" name="arrow" color="#CACFDB" :size="24" />
+                <van-icon v-if="!form.id" name="arrow" color="#CCD0DC" :size="24" />
             </div>
         </div>
         <div class="page-info">
@@ -69,7 +69,7 @@
                         v-model="form.productCategoryId"
                     ></product-category-select>
                 </div>
-                <van-icon name="arrow" color="#CACFDB" :size="24" />
+                <van-icon name="arrow" color="#CCD0DC" :size="24" />
             </div>
         </div>
 
@@ -79,7 +79,7 @@
                 <div class="text">
                     <application-select v-model="form.applicationField" ref="applicationField"></application-select>
                 </div>
-                <van-icon name="arrow" color="#CACFDB" :size="24" />
+                <van-icon name="arrow" color="#CCD0DC" :size="24" />
             </div>
         </div>
 
@@ -98,11 +98,16 @@
             />
         </div>
 
+        <div class="del-btn" v-if="orderId">
+            <van-button block plain size="small" :color="$colors.info" @click="del">删除</van-button>
+        </div>
+
         <fixed-button>
             <van-button block @click="submit" :color="$colors.warn" :disabled="!canNext">{{
                 orderId ? $t('bao-cun') : $t('ti-jiao')
             }}</van-button>
         </fixed-button>
+        <van-dialog id="van-dialog" />
     </div>
 </template>
 <script>
@@ -151,7 +156,7 @@ export default {
         }
     },
     onLoad(options) {
-        if (this.$store.state.userInfo.identity !== 'BUYERS') {
+        if (this.$store.state.userInfo && this.$store.state.userInfo.identity !== 'BUYERS') {
             this.isVendor = true;
         } else {
             this.isVendor = false;
@@ -163,8 +168,9 @@ export default {
                 .then(res => {
                     delete res.productCategory;
                     this.form = res;
+                    this.loading = false;
                 })
-                .finally(() => {
+                .catch(() => {
                     this.loading = false;
                 });
         }
@@ -247,6 +253,23 @@ export default {
                 .catch(e => {
                     this.$toast(e.error);
                 });
+        },
+        del() {
+            this.dialog('确认要删除该清单吗？', true, false, '立即删除')
+                .then(() => {
+                    return this.$http.post(`/productList/del/${this.orderId}`);
+                })
+                .then(() => {
+                    this.toast('删除成功！', 'success');
+                    setTimeout(() => {
+                        this.navigateBack();
+                    }, 1000);
+                })
+                .catch(e => {
+                    if (e.error) {
+                        this.toast(e.error);
+                    }
+                });
         }
     },
     components: {
@@ -300,4 +323,9 @@ export default {
         color: #000;
     }
 }
+
+.del-btn {
+    margin: 16px;
+    --button-border-width: 0px;
+}
 </style>

src/pagesNews/Detail.vue

@@ -37,14 +37,13 @@
                     </div>
                 </div>
             </div>
+            <div class="introduction" v-else-if="info.introduction">
+                {{ info.introduction }}
+            </div>
 
             <div class="detail">
                 <h2>{{ isActivity ? '活动' : '新闻' }}详情</h2>
 
-                <div class="introduction" v-if="info.introduction">
-                    {{ info.introduction }}
-                </div>
-
                 <div class="html" v-html="info.content"></div>
             </div>
         </div>
@@ -246,18 +245,18 @@ export default {
     }
 }
 
+.introduction {
+    font-size: 14px;
+    color: #878d99;
+    line-height: 22px;
+    padding: 10px 0 0;
+}
+
 .detail {
     padding: 50px 0;
     .html {
         padding-top: 14px;
     }
-
-    .introduction {
-        font-size: 14px;
-        color: #292c33;
-        line-height: 24px;
-        padding: 14px 0 0;
-    }
 }
 
 .imgList-btn {

src/pagesProduct/Contrast.vue

@@ -41,9 +41,9 @@
             v-else
         >
             <div class="empty-button">
-                <van-button :color="$colors.warn" :radius="4" block @click="navigateTo('/pagesProduct/FilterVendor')"
-                    >添加产品</van-button
-                >
+                <van-button :color="$colors.warn" :radius="4" block @click="navigateTo('/pagesProduct/FilterVendor')">
+                    添加产品
+                </van-button>
             </div>
         </van-empty>
 

src/pagesProduct/Detail.vue

@@ -715,7 +715,6 @@ export default {
     height: calc(60px + env(safe-area-inset-bottom));
     padding-bottom: calc(8px + constant(safe-area-inset-bottom));
     padding-bottom: calc(8px + env(safe-area-inset-bottom));
-
     .fixed-bottom-content {
         background-color: @bgw;
         padding: 0px 16px;
@@ -759,6 +758,7 @@ export default {
                 width: 120px;
 
                 --button-border-radius: 0px;
+                --button-border-width: 0px;
             }
 
             .intentionList {

src/utils/appState.js

@@ -72,8 +72,7 @@ const InformationType = new Map([
     [
         'POLICY_INFORMATION',
         {
-            name: 'zheng-ce-xin-xi',
-            type: 'bigImg'
+            name: 'zheng-ce-xin-xi'
         }
     ],
     [