shish 5 лет назад
Родитель
Сommit
8c9792a540

+ 19 - 3
hdApp/src/admin/billing/index.vue

@@ -93,6 +93,7 @@
 									@add="addEvent"
 									@addOneEvent="addCustomNumEvent"
 									@del="delEvent"
+									@showBigCover="showBigCover"
 								></Commondity>
 							</view>
 							<!-- <Commondity
@@ -152,6 +153,9 @@
 		<!--<FooterCart :price="allGoodsPrice" :count="allGoodsCount" @confirm="confirmSelectGoodsEvent" v-if="tabIndex == 0"></FooterCart>-->
 		<FooterCart :price="allGoodsPrice" :countNumber="allGoodsCount" @confirm="confirmSelectGoodsEvent" v-if="tabIndex == 0"></FooterCart>
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" v-if="tabIndex == 1"></FooterCart>
+
+   		<sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
+
 	</view>
 </template>
 
@@ -166,7 +170,7 @@ import FooterCart from "@/components/module/app-footer-cart";
 import ModalModule from "@/components/plugin/modal";
 import allMoreSelectInput from "@/components/module/allMoreSelectInput";
 import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
-
+import SelPopup from "@/components/sel-popup.vue";
 import { COMMODITY_TYPE } from "@/utils/declare";
 import productMins from "@/mixins/product";
 export default {
@@ -177,7 +181,7 @@ export default {
 		AppWrapperEmpty,
 		Commondity,
 		ModalModule,
-		FooterCart,allMoreSelectInput,PxClassCommondity,GoodsCommondity
+		FooterCart,allMoreSelectInput,PxClassCommondity,GoodsCommondity,SelPopup
 	},
 	mixins: [productMins,allMoreSelectInputMins],
 	data() {
@@ -197,7 +201,9 @@ export default {
 				bigCount: 0,
 				smallCount: 0
 			},
-			showSubmitModel: false
+			showSubmitModel: false,
+			popupShow:false,
+			infoData:{}
 		};
 	},
 	computed: {
@@ -217,6 +223,16 @@ export default {
 	},
 
 	methods: {
+	    showPopup() {
+	        this.popupShow = true;
+	    },
+	    hidePopup() {
+	      this.popupShow = false;
+	    },
+		showBigCover(item){
+			this.popupShow=true
+			this.infoData = item
+		},
 		//自定义数量
 		customNum(info) {
 			this.isModel = true;

+ 4 - 1
hdApp/src/components/module/app-commodity.vue

@@ -3,7 +3,7 @@
 		<!--		<view class="img_bx" @click="addEvents">-->
 		<!--			<app-img  :src="info.cover" alt="商品图" mode="aspectFit" :height="160" />-->
 		<!--		</view>-->
-		<view class="img_bx" style="background:#eeeeee">
+		<view class="img_bx" style="background:#eeeeee" @click.stop="showBigImg">
 			<image :src="info.cover" v-if="isImg"></image>
 		</view>
 		<view class="cmd-info_bx">
@@ -165,6 +165,9 @@ export default {
 				})
 			}
 		},
+		showBigImg(){
+			this.$emit("showBigCover", this.info);
+		},
 		addEvents() {
 			const ratio = Number(this.info.ratio);
 			if(this.offVerifyRepertory){

+ 180 - 0
hdApp/src/components/sel-popup.vue

@@ -0,0 +1,180 @@
+<template>
+  <div class="sel-popup">
+    <bottom-popup class="popup-wrap" :show="show" @close="close">
+      <app-close @close="close" />
+      <div class="tui-popup-box">
+        <image :src="getCover" mode="aspectFit" style="height:550rpx"></image>
+      </div>
+    </bottom-popup>
+  </div>
+</template>
+<script>
+import BottomPopup from "@/components/plugin/bottom-popup";
+import NumberBox from "@/components/plugin/number-box";
+import AppClose from "@/components/module/app-close";
+export default {
+  name: "sel-popup",
+  components: {
+    BottomPopup,
+    NumberBox,
+    AppClose
+  },
+  props: {
+    // 信息
+    info: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    buyNum: {
+      type: Number,
+      default: 1
+    },
+    show: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selIndex: 0
+    };
+  },
+  computed: {
+    getCover() {
+      if (!this.$util.isEmpty(this.info)) {
+        return this.info.bigCover;
+      }
+    }
+  },
+  methods: {
+    change(e) {
+      this.$emit("change", e);
+    },
+    close() {
+      this.$emit("close");
+    },
+    changeStyleFn(index) {
+      this.selIndex = index;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/.popup-wrap {
+  .tui-popup-class {
+    border-top-left-radius: 24rpx;
+    border-top-right-radius: 24rpx;
+    // 适配iphoneX
+    padding-bottom: env(safe-area-inset-bottom);
+  }
+  .tui-popup-box {
+    padding: 80rpx 10px 30rpx;
+  }
+  .tui-popup-btn {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    padding: 14px 0;
+    @include disFlex(center, center);
+    border-top: 1px solid $borderColor;
+    .button-com {
+      width: 80%;
+      font-size: 32px;
+    }
+  }
+
+  .tui-product-box {
+    display: flex;
+    align-items: center;
+    font-size: 24rpx;
+    padding-bottom: 30rpx;
+  }
+
+  .tui-popup-img {
+    height: 200rpx;
+    width: 200rpx;
+    border-radius: 24rpx;
+    display: block;
+  }
+
+  .tui-popup-price {
+    padding-left: 20rpx;
+    padding-bottom: 8rpx;
+    .goods-tit {
+      margin-bottom: 75px;
+    }
+  }
+
+  .tui-amount {
+    color: #ff201f;
+    font-size: 36rpx;
+  }
+
+  .tui-popup-scroll {
+    max-height: 380rpx;
+    font-size: 26rpx;
+  }
+
+  .tui-scrollview-box {
+    padding: 0 30rpx 60rpx 30rpx;
+    box-sizing: border-box;
+  }
+
+  .tui-attr-title {
+    padding: 10rpx 0;
+    color: #333;
+  }
+
+  .tui-attr-box {
+    font-size: 0;
+    padding: 20rpx 0;
+  }
+
+  .tui-attr-item {
+    max-width: 100%;
+    min-width: 200rpx;
+    height: 64rpx;
+    display: -webkit-inline-flex;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    background: #f7f7f7;
+    padding: 0 26rpx;
+    box-sizing: border-box;
+    border-radius: 32rpx;
+    margin-right: 20rpx;
+    margin-bottom: 20rpx;
+    font-size: 26rpx;
+  }
+
+  .tui-attr-active {
+    background: #fcedea !important;
+    color: #e41f19;
+    font-weight: bold;
+    position: relative;
+  }
+
+  .tui-attr-active::after {
+    content: "";
+    position: absolute;
+    border: 1rpx solid #e41f19;
+    width: 100%;
+    height: 100%;
+    border-radius: 40rpx;
+    left: 0;
+    top: 0;
+  }
+
+  .tui-number-box {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20rpx 0 30rpx 0;
+    box-sizing: border-box;
+  }
+}
+</style>

+ 6 - 6
hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx0d42f5f1dcb3a370",
+  "extAppid": "wxe4675bab299a52f7",
   "directCommit": false,
   "ext": {
-    "account": 12358,
-    "apiHost": "https://api.shop.huahb.cn",
-    "socketApiHost": "api.shop.huahb.cn",
-    "imgHost": "https://img.huahb.cn",
-    "name":"花惠宝"
+    "account": 12362,
+    "apiHost": "https://api.shop.huaml.com",
+    "socketApiHost": "api.shop.huaml.com",
+    "imgHost": "https://img.huaml.com",
+    "name":"花美玲"
   }
 }

+ 1 - 1
hdApp/src/manifest.json

@@ -84,7 +84,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(花惠宝) wx0d42f5f1dcb3a370 开发(花美玲) wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wx0d42f5f1dcb3a370",
+        "appid" : "wxe4675bab299a52f7",
         "setting" : {
             "urlCheck" : false
         },

+ 19 - 2
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -57,6 +57,7 @@
 									@add="addEvent"
 									@addOneEvent="addCustomNumEvent"
 									@del="delEvent"
+									@showBigCover="showBigCover"
 								></Commondity>
 							</view>
 							<!-- <Commondity
@@ -106,6 +107,9 @@
 		</modal-module>
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" ></FooterCart>
 		<noneHd :show.sync="notOpenShop" title="您还没有开店,无法采购哦~" btnText="免费开店" @bthClick="toPage"></noneHd>
+
+    <sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
+
 	</view>
 </template>
 
@@ -127,6 +131,7 @@ import productMins from "@/mixins/product";
 import { getGhsDataApi, ghsInfo } from "@/api/ghs/index";
 import { getShop } from '@/api/common/index'
 // import suitProductMins from "@/mixins/ghsProduct";
+import SelPopup from "@/components/sel-popup.vue";
 export default {
 	name: "Billing", // 开单
 	components: {
@@ -135,7 +140,7 @@ export default {
 		AppWrapperEmpty,
 		Commondity,
 		ModalModule,
-		FooterCart,allMoreSelectInput,PxClassCommondity,GoodsCommondity,noneHd
+		FooterCart,allMoreSelectInput,PxClassCommondity,GoodsCommondity,noneHd,SelPopup
 	},
 	props: {
 		ghsShopAdminId:{
@@ -147,6 +152,7 @@ export default {
 	data() {
 		return {
 			COMMODITY_TYPE,
+			popupShow:false,
 			isGhsProduct:true,//采购进店开单
 			isFocus: false,
 			isModel: false,
@@ -166,7 +172,8 @@ export default {
 				debtAmount:'0.00'
 			},
 			myClass: 'fadeIn',
-			shopId:0
+			shopId:0,
+			infoData:{}
 		};
 	},
 	onPullDownRefresh() {
@@ -213,6 +220,16 @@ export default {
 
 	},
 	methods: {
+	    showPopup() {
+	        this.popupShow = true;
+	    },
+	    hidePopup() {
+	      this.popupShow = false;
+	    },
+		showBigCover(item){
+			this.popupShow=true
+			this.infoData = item
+		},
 		init(){
 
 			//扫码采购 shish 20210614

+ 6 - 6
hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {