商城

mallApp/src/pages/billing/affirmGhs.vue

@@ -43,7 +43,7 @@
 				<text class="price-title">合计</text>
 				<text class="price-number">¥<text class="large">{{ modifyPrice}}</text></text>
 			</view>
-			<button class="admin-button-com blue middle" style="border:none;" @click="confirmForm">提交</button>
+			<button class="admin-button-com blue middle" @click="confirmForm">提交</button>
 		</view>
 	</view>
 </template>

mallApp/src/pages/item/components/subItem.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="cmd-info_bx">
 			<view class="tit" >{{ info.itemName}}</view>
-			<view class="kc num-open_bx flex-space" v-if="type == COMMODITY_TYPE.COMMON">
+			<view class="kc num-open_bx flex-space">
 				<view v-if="!offPrice">
 					<view class="flex-space" style="margin-top:20upx" v-if="Number(info.discountPrice)>0">
 						<view style="padding:2upx 10upx 5upx 10upx;text-align: center;color: red;border: 1px solid red;margin-right: 20upx;line-height: 1;font-size: 20upx">
@@ -16,28 +16,17 @@
 					<view class="price" >￥{{ parseFloat(info.price) }}</view>
 				</view>
 				<view class="price" v-else></view>
-				<view style="text-align: right" >
-					<view class="open-bx" >
-						<i class="iconfont iconjian" :class="delAnimationData?'animation':''" @click.stop="delEvent(info.variety)" v-if="bigCount > 0 || smallCount > 0"></i>
-						<text class="num">
-							<text v-if="bigCount > 0 || smallCount > 0">{{ `${bigCount}` }}</text>
-							<text v-if="smallCount > 0">/</text>
-							<text v-if="smallCount > 0">{{ `${smallCount}` }}</text>
-						</text>
-						<i class="iconfont iconzeng" :class="addAnimationData?'animation':''" @click.stop="addEvents(info.variety)"></i>
-					</view>
-				</view>
-			</view>
-			<view class="num-open_bx flex-space" v-if="type == COMMODITY_TYPE.CHANGE">
-				<view class="price" v-if="!offPrice">￥{{ showPrice }}</view>
-				<view class="price" v-else></view>
-				<view class="open-bx" style="padding-bottom: 40upx" >
-					<allSelectInput :inputType="'digit'" :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="changeAutoPrice" :placeholder="'自动调价'"
-									@deleteInputVal="deleteInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAllInput">
-					</allSelectInput>
-					<i :class="isShowSucceed?'position iconfont iconjihuo':'position'" ></i>
-					<view class="btn-box" @click="changePriceEvent">确定</view>
+				
+				<view class="open-bx" >
+					<i class="iconfont iconjian" :class="delAnimationData?'animation':''" @click.stop="delEvent(info.variety)" v-if="bigCount > 0 || smallCount > 0"></i>
+					<text class="num">
+						<text v-if="bigCount > 0 || smallCount > 0">{{ `${bigCount}` }}</text>
+						<text v-if="smallCount > 0">/</text>
+						<text v-if="smallCount > 0">{{ `${smallCount}` }}</text>
+					</text>
+					<i class="iconfont iconzeng" :class="addAnimationData?'animation':''" @click.stop="addEvents(info.variety)"></i>
 				</view>
+
 			</view>
 		</view>
 	</view>
@@ -153,6 +142,8 @@ export default {
 			this.$emit("showBigCover", this.info);
 		},
 		addEvents(variety) {
+			//暂时不考虑小菊图片问题
+			variety = 0
 			if(variety == 0){
 				const ratio = Number(this.info.ratio);
 				if(this.offVerifyRepertory){
@@ -173,9 +164,10 @@ export default {
 			}
 		},
 		delEvent(variety) {
+			//暂时不考虑小菊图片问题
+			variety = 0
 			if(variety == 0){
 				this.animationFun('del');
-				console.log(this.info,'this.info')
 				this.$emit("del", this.info);
 			}else{
 				//去特殊品种页
@@ -188,6 +180,8 @@ export default {
 
 		},
 		customNum(variety) {
+			//暂时不考虑小菊图片问题
+			variety = 0
 			if(variety == 0){
 				if(this.info.stock<=0){
 					uni.showToast({title:'没有货了',icon:'none'})
@@ -264,6 +258,9 @@ export default {
 				font-weight:550;
 			}
 			& .open-bx {
+				position: absolute;
+				right:10upx;
+				top:10upx;
 				display: flex;
 				align-items: center;
 				& .iconfont {

mallApp/src/pages/item/item.vue

@@ -145,7 +145,6 @@ export default {
 		};
 	},
 	onPullDownRefresh() {
-		console.log(100)
 		this.init().then(res => {
 			uni.stopPullDownRefresh();
 		});
@@ -207,24 +206,6 @@ export default {
 	},
 	onUnload() {
 	},
-	onShareAppMessage(res) {
-		let ghsShopAdminId = this.option.ghsShopAdminId ? this.option.ghsShopAdminId : 0
-
-		if(this.option.shopId){
-			this.shopId = this.option.shopId
-		}
-
-		let fromCg =  this.option.fromCg ? this.option.fromCg : 0
-
-		//查看分享的路径，不要删除 shish 20210517
-		console.log(`pagesPurchase/ghsProduct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${ghsShopAdminId}&shopId=${this.shopId}&id=0&fromGhsId=${this.ghsId}&fromCg=${fromCg}`)
-
-		return {
-			title: this.ghsInfo.name,
-			desc: "首次下单领红包",
-			path: `pagesPurchase/ghsProduct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${ghsShopAdminId}&shopId=${this.shopId}&id=0&fromGhsId=${this.ghsId}&fromCg=${fromCg}`
-		}
-	},
 	methods: {
 		recharge(item){
 			this.$util.pageTo({url:'/pagesStore/me/recharge',query:{ghsId:item.id}})
@@ -245,14 +226,12 @@ export default {
 			this.popupShow = false;
 		},
 		showBigCover(item){
-      this.$util.pageTo({url: "/admin/ghsProduct/detail",query: {id: item.id,ghsId:this.option.id}})
+      		this.$util.pageTo({url: "/admin/ghsProduct/detail",query: {id: item.id,ghsId:this.option.id}})
 		},
 		init(){
 			this.init = false
-
 			const shopId = uni.getStorageSync('account')
 			this.option.shopId = shopId
-			console.log(shopId)
 			this.initGhsData(0,shopId);
 		},
 		scroll_detail(options){

mallApp/src/static/css/common.scss

@@ -112,7 +112,7 @@ body {
     padding: 10px 20px;
     background-color: #fff;
     border-radius: 8px;
-    border: 1px solid $mainColor;
+    border: 1upx solid $mainColor;
     text-align: center;
     line-height: 1;
     margin: 0;

mallApp/src/static/iconfont/iconfont-production.css

@@ -1,20 +1,166 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot');
-  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
+  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {
   font-family: "iconfont" !important;
-  font-size: 32px;
+  font-size: 16upx;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.iconcachu::before {
+  content: "\e7e6";
+}
+
+.iconjihuo:before {
+  content: "\e601";
+}
+
+.iconmingxi1:before {
+  content: "\e7e5";
+}
+.iconjian:before {
+  content: "\e7e3";
+}
+
+.iconzeng:before {
+  content: "\e7e4";
+}
+
+.iconqiehuan1:before {
+  content: "\e7e2";
+}
+
+.iconqishouyinying:before {
+  content: "\e7e1";
+}
+
+.iconxiayi:before {
+  content: "\e7de";
+}
+
+.iconshangyi:before {
+  content: "\e7e0";
+}
+
+.iconyiruku:before {
+  content: "\e7df";
+}
+
+.iconyikaidian:before {
+  content: "\e7d7";
+}
+
+.icondianhua1:before {
+  content: "\e7d9";
+}
+
+.iconshoukuanma1:before {
+  content: "\e7d8";
+}
+
+.icondaichuku:before {
+  content: "\e7da";
+}
+
+.iconyichuku:before {
+  content: "\e7db";
+}
+
+.iconyiquxiao:before {
+  content: "\e7dc";
+}
+
+.icondairuku:before {
+  content: "\e7dd";
+}
+
+.iconshoukuanma:before {
+  content: "\e600";
+}
+
+.icongouwuche:before {
+  content: "\e7d5";
+}
+
+.iconjianqu:before {
+  content: "\e7d3";
+}
+
+.icontianjia:before {
+  content: "\e7d4";
+}
+
+.iconsearch1:before {
+  content: "\e7d6";
+}
+
+.icondingdanweixuanzhong1:before {
+  content: "\e7c9";
+}
+
+.icondianpuweixuanzhong:before {
+  content: "\e7ca";
+}
+
+.iconwodeweixuanzhong:before {
+  content: "\e7cb";
+}
+
+.iconyingyongweixuanzhong:before {
+  content: "\e7cc";
+}
+
+.icondianpuxuanzhong:before {
+  content: "\e7cd";
+}
+
+.icondingdanxuanzhong1:before {
+  content: "\e7ce";
+}
+
+.iconwodexuanzhong:before {
+  content: "\e7cf";
+}
+
+.iconkehuweixuanzhong1:before {
+  content: "\e7d0";
+}
+
+.iconyingyongxuanzhong:before {
+  content: "\e7d1";
+}
+
+.iconkehuxuanzhong1:before {
+  content: "\e7d2";
+}
+
+.iconxiaochengxu2:before {
+  content: "\e78d";
+}
+
+.iconmeituan:before {
+  content: "\e78e";
+}
+
+.iconzhangshangcaifuyemianshoujiban344:before {
+  content: "\e632";
+}
+
+.iconwaimai:before {
+  content: "\e692";
+}
+
+.iconxiaochengxu1:before {
+  content: "\e619";
+}
 
 .iconjiantouxia:before {
   content: "\e61a";
@@ -286,5 +432,4 @@
 
 .iconyishiyong:before {
   content: "\e73c";
-}
-
+}

mallApp/src/static/iconfont/iconfont.css

@@ -1,20 +1,166 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot');
-  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
+  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {
   font-family: "iconfont" !important;
-  font-size: 32px;
+  font-size: 16upx;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.iconcachu::before {
+  content: "\e7e6";
+}
+
+.iconjihuo:before {
+  content: "\e601";
+}
+
+.iconmingxi1:before {
+  content: "\e7e5";
+}
+.iconjian:before {
+  content: "\e7e3";
+}
+
+.iconzeng:before {
+  content: "\e7e4";
+}
+
+.iconqiehuan1:before {
+  content: "\e7e2";
+}
+
+.iconqishouyinying:before {
+  content: "\e7e1";
+}
+
+.iconxiayi:before {
+  content: "\e7de";
+}
+
+.iconshangyi:before {
+  content: "\e7e0";
+}
+
+.iconyiruku:before {
+  content: "\e7df";
+}
+
+.iconyikaidian:before {
+  content: "\e7d7";
+}
+
+.icondianhua1:before {
+  content: "\e7d9";
+}
+
+.iconshoukuanma1:before {
+  content: "\e7d8";
+}
+
+.icondaichuku:before {
+  content: "\e7da";
+}
+
+.iconyichuku:before {
+  content: "\e7db";
+}
+
+.iconyiquxiao:before {
+  content: "\e7dc";
+}
+
+.icondairuku:before {
+  content: "\e7dd";
+}
+
+.iconshoukuanma:before {
+  content: "\e600";
+}
+
+.icongouwuche:before {
+  content: "\e7d5";
+}
+
+.iconjianqu:before {
+  content: "\e7d3";
+}
+
+.icontianjia:before {
+  content: "\e7d4";
+}
+
+.iconsearch1:before {
+  content: "\e7d6";
+}
+
+.icondingdanweixuanzhong1:before {
+  content: "\e7c9";
+}
+
+.icondianpuweixuanzhong:before {
+  content: "\e7ca";
+}
+
+.iconwodeweixuanzhong:before {
+  content: "\e7cb";
+}
+
+.iconyingyongweixuanzhong:before {
+  content: "\e7cc";
+}
+
+.icondianpuxuanzhong:before {
+  content: "\e7cd";
+}
+
+.icondingdanxuanzhong1:before {
+  content: "\e7ce";
+}
+
+.iconwodexuanzhong:before {
+  content: "\e7cf";
+}
+
+.iconkehuweixuanzhong1:before {
+  content: "\e7d0";
+}
+
+.iconyingyongxuanzhong:before {
+  content: "\e7d1";
+}
+
+.iconkehuxuanzhong1:before {
+  content: "\e7d2";
+}
+
+.iconxiaochengxu2:before {
+  content: "\e78d";
+}
+
+.iconmeituan:before {
+  content: "\e78e";
+}
+
+.iconzhangshangcaifuyemianshoujiban344:before {
+  content: "\e632";
+}
+
+.iconwaimai:before {
+  content: "\e692";
+}
+
+.iconxiaochengxu1:before {
+  content: "\e619";
+}
 
 .iconjiantouxia:before {
   content: "\e61a";
@@ -286,5 +432,4 @@
 
 .iconyishiyong:before {
   content: "\e73c";
-}
-
+}

mallApp/src/static/iconfont/readme.md

@@ -13,10 +13,10 @@
 	url('https://at.alicdn.com/t/font_1352166_t16gekn9k1e.svg#iconfont') format('svg');
 }
 ```
-font-size改成默认30px
+font-size改成默认30upx
 ```
 .iconfont {
-  font-size: 30px;
+  font-size: 30upx;
 }
 ```