shish 2 سال پیش
والد
کامیت
ef0bf9fcdb
3فایلهای تغییر یافته به همراه41 افزوده شده و 7 حذف شده
  1. 22 7
      ghsApp/src/admin/home/me.vue
  2. 18 0
      ghsApp/src/admin/home/workbench.vue
  3. 1 0
      ghsApp/src/admin/item/detail.vue

+ 22 - 7
ghsApp/src/admin/home/me.vue

@@ -31,12 +31,11 @@
             <button v-if="getLoginInfo.switchShop" @click.stop="modifyShop" class="admin-button-com default chang-shop_btn" > <i class="iconfont iconqiehuan1"></i> 切换门店 </button>
           </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 -->
+            <view class="dec">
+              <block v-if="showDeadline">
+                到期时间 {{ myInfo.deadline ? myInfo.deadline.substr(0,11) : '' }}
+              </block>
+            </view>
             <image :src="`${constant.imgUrl}/ghs/me/upgrade2.png`"></image> 
           </view>
         </view>
@@ -218,7 +217,8 @@ export default {
       inAmountShow:false,
       inAmountFocus:false,
       outAmountFocus:false,
-      lookMoney:0
+      lookMoney:0,
+      showDeadline:false
     };
   },
   onPullDownRefresh () {
@@ -234,6 +234,21 @@ export default {
     if(plus.runtime.version){
       this.version = plus.runtime.version
     }
+
+    let that = this
+    let type = uni.getSystemInfoSync().platform
+    switch(type){
+      case 'android':
+        that.showDeadline = true
+        break;
+      case 'ios':
+        that.showDeadline = false
+        break;
+      default:
+    }
+    // #endif
+    // #ifdef MP-WEIXIN
+    this.showDeadline = true
     // #endif
   },
   methods: {

+ 18 - 0
ghsApp/src/admin/home/workbench.vue

@@ -128,6 +128,12 @@
 		</view>
 	</uni-popup>
 
+	<uni-popup ref="renewRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+        <view style="display:flex;padding:20upx;height:auto;width:90vw;">
+			<view>为了支持软件公司的发展</view>
+        </view>
+    </uni-popup>
+
 </view>
 </template>
 
@@ -218,6 +224,15 @@ export default {
 		if(this.$util.isScanEnv()){
 			this.isScanEnv = true
 		}
+		// #ifdef APP-PLUS
+		let type = uni.getSystemInfoSync().platform
+		if(type == 'android'){
+			this.popRenew()
+		}
+		// #endif
+		// #ifdef MP-WEIXIN
+			this.popRenew()
+		// #endif
 	},
 	onPullDownRefresh() {
 		this.init();
@@ -240,6 +255,9 @@ export default {
 		toPhone(){
 			uni.makePhoneCall({ phoneNumber:'15280215347' })
 		},
+		popRenew(){
+			this.$refs.renewRef.open('center')
+		},
 		start(){
 			renewShop().then(res=>{
 				if(res.code == 1){

+ 1 - 0
ghsApp/src/admin/item/detail.vue

@@ -279,6 +279,7 @@
         </view>
       </view>
     </uni-popup>
+
 		<uni-popup ref="rightShowMore" background-color="#fff" type="center" :animation="true" class="class-popup-style">
 			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
         <view style="width:100vw;margin-top:8upx;"><button @click="goWaste(productData)">报损</button></view>