shish 2 лет назад
Родитель
Сommit
5a539887df
2 измененных файлов с 17 добавлено и 3 удалено
  1. 9 1
      ghsApp/src/admin/home/me.vue
  2. 8 2
      ghsApp/src/admin/notice/index.vue

+ 9 - 1
ghsApp/src/admin/home/me.vue

@@ -30,7 +30,15 @@
             </view>
             <button v-if="getLoginInfo.switchShop" @click="modifyShop" class="admin-button-com default chang-shop_btn" > <i class="iconfont iconqiehuan1"></i> 切换门店 </button>
           </view>
-          <view class="image-box" > <view class="dec"></view> <image :src="`${constant.imgUrl}/ghs/me/upgrade2.png`"></image> </view>
+          <view class="image-box" >
+            <!-- #ifdef MP-WEIXIN -->
+            <view class="dec">到期时间 {{ myInfo.deadline ? myInfo.deadline.substr(0,11) : '' }}</view>
+            <!-- #endif -->
+            <!-- #ifdef APP-PLUS --> 
+            <view class="dec"></view>
+            <!-- #endif -->
+            <image :src="`${constant.imgUrl}/ghs/me/upgrade2.png`"></image> 
+          </view>
         </view>
 
         <template v-if="lookMoney == 1">

+ 8 - 2
ghsApp/src/admin/notice/index.vue

@@ -11,8 +11,14 @@
                 <block v-if="!$util.isEmpty(list.data)">
                     <view class="allot-item" v-for="(item, index) in list.data" :key="index" @click="goTo(item)" >
                         <view class="info">
-                            <view class="info-order-un-read" v-if="item.read == 0">{{ item.title }}</view>
-                            <view class="info-order" v-else>{{ item.title }}</view>
+                            <view class="info-order-un-read" v-if="item.read == 0">
+                                {{ item.title }}
+                                <text style="float:right;font-weight:normal;font-size:26upx;">{{ item.addTime ? item.addTime.substr(5,11):'' }}</text>
+                            </view>
+                            <view class="info-order" v-else>
+                                {{ item.title }}
+                                <text style="float:right;font-weight:normal;font-size:26upx;">{{ item.addTime ? item.addTime.substr(5,11):'' }}</text>
+                            </view>
                             <view class="info-name">{{ item.content }}</view>
                         </view>
                     </view>