shish 4 лет назад
Родитель
Сommit
ea389769cd

+ 1 - 1
ghsApp/src/admin/chat/index.vue

@@ -75,7 +75,7 @@
 		},
 		computed: {
 			scrollHei() {
-				return uni.upx2upx(1334 - 170) + 'px'
+				return uni.upx2px(1334 - 170) + 'px'
 			}
 		},
 		methods: {

+ 2 - 2
ghsApp/src/components/app-swiper.vue

@@ -68,14 +68,14 @@ export default {
 	computed: {
 		widthFn() {
 			if (this.width.type == 'number') {
-				return uni.upx2upx(this.width.val) + 'px'
+				return uni.upx2px(this.width.val) + 'px'
 			} else {
 				return this.width.val
 			}
 		},
 		heightFn() {
 			if (this.height.type == 'number') {
-				return uni.upx2upx(this.height.val) + 'px'
+				return uni.upx2px(this.height.val) + 'px'
 			} else {
 				return this.height.val
 			}

+ 2 - 2
ghsApp/src/components/plugin/tabs.vue

@@ -214,12 +214,12 @@ export default {
 	},
 	computed: {
 		// addTabWidth() {
-		// 	return uni.upx2upx(130)
+		// 	return uni.upx2px(130)
 		// }
 	},
 	methods: {
 		checkCor: function() {
-			let addTabWidth = this.isAdd ? uni.upx2upx(this.addTabWidth + 30) : 0;
+			let addTabWidth = this.isAdd ? uni.upx2px(this.addTabWidth + 30) : 0;
 			let tabsNum = this.tabs.length;
 			let padding = (this.winWidth / 750) * this.padding;
 			let width = this.winWidth - padding * 2 - addTabWidth;

+ 1 - 1
ghsApp/src/components/w-picker/w-picker.vue

@@ -224,7 +224,7 @@
 		},
 		data() {
 			return {
-				itemHeight:`height: ${uni.upx2upx(88)}upx;`,
+				itemHeight:`height: ${uni.upx2px(88)}upx;`,
 				result:{},
 				confirmFlag:true
 			};

+ 1 - 1
hdApp/src/admin/chat/index.vue

@@ -75,7 +75,7 @@
 		},
 		computed: {
 			scrollHei() {
-				return uni.upx2upx(1334 - 170) + 'px'
+				return uni.upx2px(1334 - 170) + 'px'
 			}
 		},
 		methods: {

+ 2 - 2
hdApp/src/components/app-swiper.vue

@@ -62,14 +62,14 @@ export default {
 	computed: {
 		widthFn() {
 			if (this.width.type == 'number') {
-				return uni.upx2upx(this.width.val) + 'px'
+				return uni.upx2px(this.width.val) + 'px'
 			} else {
 				return this.width.val
 			}
 		},
 		heightFn() {
 			if (this.height.type == 'number') {
-				return uni.upx2upx(this.height.val) + 'px'
+				return uni.upx2px(this.height.val) + 'px'
 			} else {
 				return this.height.val
 			}

+ 2 - 2
hdApp/src/components/plugin/tabs.vue

@@ -214,12 +214,12 @@ export default {
 	},
 	computed: {
 		// addTabWidth() {
-		// 	return uni.upx2upx(130)
+		// 	return uni.upx2px(130)
 		// }
 	},
 	methods: {
 		checkCor: function() {
-			let addTabWidth = this.isAdd ? uni.upx2upx(this.addTabWidth + 30) : 0;
+			let addTabWidth = this.isAdd ? uni.upx2px(this.addTabWidth + 30) : 0;
 			let tabsNum = this.tabs.length;
 			let padding = (this.winWidth / 750) * this.padding;
 			let width = this.winWidth - padding * 2 - addTabWidth;

+ 1 - 1
hdApp/src/components/w-picker/w-picker.vue

@@ -224,7 +224,7 @@
 		},
 		data() {
 			return {
-				itemHeight:`height: ${uni.upx2upx(88)}px;`,
+				itemHeight:`height: ${uni.upx2px(88)}px;`,
 				result:{},
 				confirmFlag:true
 			};

+ 2 - 13
hdApp/src/pagesClient/official/index.vue

@@ -25,22 +25,14 @@
       </div>
       <div class="ad-list-wrap">
         <div class="ad-list" v-for="(item, index) in adData" :key="index">
-          <app-img
-            :src="`${constant.imgUrl}/retail/official/list-${index + 1}.png`"
-            mode="widthFix"
-            alt="他们都在用"
-          />
+          <app-img :src="`${constant.imgUrl}/retail/official/list-${index + 1}.png`" mode="widthFix" alt="他们都在用" />
         </div>
       </div>
     </div>
-    <!-- trademark -->
     <div class="bottom-trademark">
       <img :src="`${constant.imgUrl}/retail/common/trademark.png`" alt />
     </div>
-    <!-- buttom -->
-    <div class="app-footer" @click="tryUse" v-if="getLoginInfo.openShop == 1">申请</div>
-    <div class="app-footer" v-if="getLoginInfo.openShop == 2">审核中</div>
-    <div class="app-footer" v-if="getLoginInfo.openShop == 3" @click="renwe">续期</div>
+    <div class="app-footer" @click="tryUse">申请</div>
   </div>
 </template>
 
@@ -172,9 +164,6 @@ export default {
       tryUse(){
         this.pageTo({url: '/pagesClient/official/pay',type: 2,query:{...this.option}})
       },
-      renwe(){
-        this.pageTo({url: '/pagesClient/official/renewal',type: 2})
-      },
       contactFn() {
         uni.makePhoneCall({
           phoneNumber: "05923272000"

+ 1 - 1
hdApp/src/pagesClient/official/pay.vue

@@ -31,7 +31,7 @@
         <span></span>
         <span class="app-price">
           <span></span>
-          <span class="app-size-40" style="text-decoration:line-through">{{ detail.price }}</span>
+          <span class="app-size-40" style="text-decoration:line-through"></span>
         </span>
       </div>
       <button class="admin-button-com middle blue" @click="pageTo({url: '/pagesClient/official/apply',type:2,query:{...option}})">申请</button>

+ 0 - 2
hdApp/src/pagesInvite/list.vue

@@ -122,8 +122,6 @@ export default {
 	},
 	methods: {
 		inviteHd(){
-			this.$msg('开发中')
-			return false
       		this.pageTo({url: '/pagesInvite/inviteHdShop'})
 		},
 		inviteGhs(){

+ 1 - 1
hdApp/src/uni.scss

@@ -2,7 +2,7 @@
 全局scss 变量和方法 存放处
  */
 //  uniapp upx换算函数
-//  uni.upx2upx(val) + 'px'
+//  uni.upx2px(val) + 'px'
 /* 引入minxin */
 @import '~@/static/css/minxin.scss';