修改商品页

components/goods/goodsku.vue

@@ -20,7 +20,7 @@
 						<text>{{ goodprice }}</text>
 					</view>
 					<view class="amount">库存 {{ goodamount }} {{ g.unit }}</view>
-          <view class="sku">{{ skuObj ? "已选择" : "选择" }} {{ sku }}</view>
+					<view class="sku">{{ skuObj ? '已选择' : '选择' }} {{ sku }}</view>
 				</view>
 			</view>
 			<view class="sku-box">
@@ -31,18 +31,14 @@
 							class="sku-chi"
 							:style="{
 								background: y.attr_id == x.checkId ? mc : '#eee',
-                color: y.attr_id == x.checkId ? '#FFF' : '#333',
+								color: y.attr_id == x.checkId ? '#FFF' : '#333'
 							}"
 							:class="{ disable: notStockGood.indexOf(y.attr_id) != -1 }"
 							v-for="(y, yi) in x.attr_list"
 							:key="yi"
 							@click="clickSkuItemHandler(yi, i)"
 						>
-              <image
-                :src="y.pic_url"
-                class="img"
-                v-if="i == 0 && y.pic_url"
-              ></image>
+							<image :src="y.pic_url" class="img" v-if="i == 0 && y.pic_url"></image>
 							<text class="val">{{ y.attr_name }}</text>
 						</view>
 					</view>
@@ -50,33 +46,11 @@
 			</view>
 			<view class="count-box">
 				<text class="label">购买数量</text>
-        <u-number-box
-          :disabled="!skuObj"
-          v-model="gc"
-          :min="1"
-          :max="goodamount"
-          @change="valChange"
-        ></u-number-box>
+				<u-number-box :disabled="!skuObj" v-model="gc" :min="1" :max="goodamount" @change="valChange"></u-number-box>
 			</view>
 			<view class="btn-box">
-        <view style="flex: 1;" v-if="optionType != 1">
-          <u-button
-            @click="joinCar"
-            :ripple="true"
-            :hair-line="false"
-            :custom-style="btn1"
-            >加入购物车</u-button
-          >
-        </view>
-        <view style="flex: 1;" v-if="optionType != 0">
-          <u-button
-            @click="buy"
-            :ripple="true"
-            :hair-line="false"
-            :custom-style="btn2"
-            >立即购买</u-button
-          >
-        </view>
+				<view style="flex: 1;" v-if="optionType != 1"><u-button @click="joinCar" :ripple="true" :hair-line="false" :custom-style="btn1">加入购物车</u-button></view>
+				<view style="flex: 1;" v-if="optionType != 0"><u-button @click="buy" :ripple="true" :hair-line="false" :custom-style="btn2">立即购买</u-button></view>
 			</view>
 		</view>
 	</u-popup>
@@ -88,83 +62,94 @@ export default {
 	props: {
 		borderRadius: {
 			type: [String, Number],
-      default: 0,
+			default: 0
 		},
 		value: {
 			type: Boolean,
-      default: false,
+			default: false
 		},
 		maskCloseAble: {
 			type: Boolean,
-      default: true,
+			default: true
 		},
 		safeAreaInsetBottom: {
 			type: Boolean,
-      default: true,
+			default: true
 		},
 		good: {
 			type: Object,
-      default: {},
+			default: {}
 		},
 		optionType: {
 			type: [String, Number],
-      default: 0,
+			default: 0
 		},
 		skued: {
 			type: Object,
-      default: {},
-    },
+			default: {}
+		}
 	},
 
 	data() {
 		return {
-      goodimage: "",
-      goodprice: "",
-      goodamount: "",
-      mc: "",
-      secondary: "",
+			goodimage: '',
+			goodprice: '',
+			goodamount: '',
+			mc: '',
+			secondary: '',
 			gc: 1,
 			bian: false,
 			btn1: {
 				flex: 1,
-        height: "100%",
-        borderRadius: "40px",
-        border: "none",
-        color: "#FFF",
-        fontSize: "13px",
-        width: "100%",
+				height: '100%',
+				borderRadius: '40px',
+				border: 'none',
+				color: '#FFF',
+				fontSize: '13px',
+				width: '100%'
 			},
 			btn2: {
 				flex: 1,
-        height: "100%",
-        borderRadius: "40px",
-        border: "none",
-        color: "#FFF",
-        fontSize: "13px",
-        width: "100%",
+				height: '100%',
+				borderRadius: '40px',
+				border: 'none',
+				color: '#FFF',
+				fontSize: '13px',
+				width: '100%'
 			},
-      sku: "",
+			sku: '',
 			g: {},
 			skuObj: null,
 			notStockGood: [],
-      forms:{
+			forms: {
 				list: [
 					{
 						mch_id: 0,
 						goods_list: [],
 						distance: 0,
-            remark: "",
+						remark: '',
 						order_form: [],
 						use_integral: 0,
-            user_coupon_id: 0,
-          },
+						user_coupon_id: 0
+					}
 				],
-        address_id: 0,
+				address_id: 0
 			}
 		};
 	},
 	mounted() {
-    this.g = this.good;
+		this.request2(
+			{
+				url: '/api/AppletGoods/GetAppletGoodsInfo',
+				data: {
+					GoodsId: this.good.id
+				}
+			},
+			res => {
+				console.log(res, 'resssssss');
+				this.g = res.data.goods;
+				this.goodimage = this.g.cover_pic;
+
 				this.mc = this.$uiConfig.mainColor;
 				this.secondary = this.$uiConfig.secondary;
 				this.skuObj = this.skued.id ? this.skued : null;
@@ -174,23 +159,25 @@ export default {
 					this.goodamount = this.skuObj.stock;
 				} else {
 					this.goodimage = this.g.cover_pic;
-      this.goodprice = this.g.price_min && this.g.price_min!="" ?this.g.price_min:this.g.price_content;
+					this.goodprice = this.g.price_min && this.g.price_min != '' ? this.g.price_min : this.g.price_content;
 					this.goodamount = this.g.goods_stock;
 				}
 				this.bian = this.$utils.is_biang;
 				this.btn1.background = this.secondary;
 				this.btn2.background = this.mc;
 				if (this.optionType == 2) {
-      this.btn1.borderRadius = "40px 0 0 40px";
-      this.btn2.borderRadius = "0 40px 40px 0";
+					this.btn1.borderRadius = '40px 0 0 40px';
+					this.btn2.borderRadius = '0 40px 40px 0';
 				}
-    console.log(this.skued);
-    this.g.attr_groups.forEach((x) => {
+				if (this.g.attr_groups && this.g.attr_groups.length > 0) {
+					this.g.attr_groups.forEach(x => {
 						if (!this.skuObj) {
-        (x.checkId = 0), (x.checkName = x.attr_group_name);
+							//(x.checkId = 0), (x.checkName = x.attr_group_name);
+							(x.checkId = 0), (x.checkName = x.attr_list[0].attr_name);
+							x.checkId = x.attr_list[0].attr_id;
 						} else {
 							let sign = `:${this.skuObj.sign_id}:`;
-        x.attr_list.forEach((y) => {
+							x.attr_list.forEach(y => {
 								if (sign.indexOf(`:${y.attr_id}:`) != -1) {
 									x.checkId = y.attr_id;
 									x.checkName = y.attr_name;
@@ -198,41 +185,45 @@ export default {
 							});
 						}
 					});
+				}
 				this.formatDisableSku();
 				this.formatChosenTips();
+			}
+		);
+		// this.g = this.good;
 	},
 	methods: {
 		joinCar() {
 			let h = this.apiheader();
-      h["content-type"] = "application/x-www-form-urlencoded";
+			h['content-type'] = 'application/x-www-form-urlencoded';
 			if (this.skuObj && this.skuObj.id) {
 				this.request(
 					{
-            url: "",
+						url: '',
 						data: {
-              r: "api/cart/add",
+							r: 'api/cart/add',
 							goods_id: this.g.id,
 							attr: this.skuObj.id,
-              num: this.gc == 0 ? 1 : this.gc,
+							num: this.gc == 0 ? 1 : this.gc
 						},
 						header: h,
-            method: "POST",
+						method: 'POST'
 					},
-          (res) => {
+					res => {
 						uni.showToast({
-              title: "加入购物车成功",
-              icon: "success",
-              duration: 2000,
+							title: '加入购物车成功',
+							icon: 'success',
+							duration: 2000
 						});
 						this.popupClose();
 					}
 				);
 			} else {
 				uni.showToast({
-          title: "请选择商品",
-          position: "bottom",
-          icon: "none",
-          duration: 2000,
+					title: '请选择商品',
+					position: 'bottom',
+					icon: 'none',
+					duration: 2000
 				});
 			}
 		},
@@ -243,29 +234,28 @@ export default {
 					num: this.gc,
 					cart_id: 0,
 					goods_attr_id: this.skuObj.id,
-          attr: [],
+					attr: []
 				};
-        this.skuObj.attr_list.forEach((x) => {
+				this.skuObj.attr_list.forEach(x => {
 					g.attr.push({
 						attr_id: x.attr_id,
-            attr_group_id: x.attr_group_id,
+						attr_group_id: x.attr_group_id
 					});
 				});
-        this.forms.list[0].goods_list.push(g)
-        this.forms.list[0].mch_id=this.g.mch_id
+				this.forms.list[0].goods_list.push(g);
+				this.forms.list[0].mch_id = this.g.mch_id;
 				uni.navigateTo({
-          url:
-            "/pages/order-submit/order-submit?formData=" + encodeURIComponent(JSON.stringify(this.forms)),
+					url: '/pages/order-submit/order-submit?formData=' + encodeURIComponent(JSON.stringify(this.forms)),
 					complete(res) {
 						console.log(res);
-          },
+					}
 				});
 			} else {
 				uni.showToast({
-          title: "请选择商品",
-          position: "bottom",
-          icon: "none",
-          duration: 2000,
+					title: '请选择商品',
+					position: 'bottom',
+					icon: 'none',
+					duration: 2000
 				});
 			}
 		},
@@ -280,9 +270,7 @@ export default {
 					this.g.attr_groups[groupRow].checkName = temp.attr_name;
 				} else {
 					this.g.attr_groups[groupRow].checkId = 0;
-          this.g.attr_groups[groupRow].checkName = this.g.attr_groups[
-            groupRow
-          ].attr_group_name;
+					this.g.attr_groups[groupRow].checkName = this.g.attr_groups[groupRow].attr_group_name;
 				}
 				this.formatDisableSku();
 				this.$forceUpdate();
@@ -290,20 +278,24 @@ export default {
 			}
 		},
 		formatChosenTips() {
-      let unchosen = "";
-      let chosen = "";
-      this.g.attr_groups.forEach((x) => {
-        if (x.checkId != 0) {
-          chosen += (chosen == "" ? "" : ",") + x.checkName;
+			let unchosen = '';
+			let chosen = '';
+			if (this.g.attr_groups && this.g.attr_groups.length > 0) {
+				this.g.attr_groups.forEach(x => {
+					// if (x.checkId != 0) {
+					if (x.checkId != -1) {
+						chosen += (chosen == '' ? '' : ',') + x.checkName;
 					} else {
-          unchosen += (unchosen == "" ? "" : ",") + x.attr_group_name;
+						unchosen += (unchosen == '' ? '' : ',') + x.attr_group_name;
 					}
 				});
-      if (unchosen != "") {
+			}
+
+			if (unchosen != '') {
 				this.sku = unchosen;
 				this.skuObj = null;
 				this.goodimage = this.g.cover_pic;
-        this.goodprice = this.g.price_min && this.g.price_min!="" ?this.g.price_min:this.g.price_content;
+				this.goodprice = this.g.price_min && this.g.price_min != '' ? this.g.price_min : this.g.price_content;
 				this.goodamount = this.g.goods_stock;
 			} else {
 				this.sku = chosen;
@@ -312,7 +304,8 @@ export default {
 		},
 		formatDisableSku() {
 			let sign = [];
-      this.g.attr_groups.forEach((x) => {
+			if (this.g.attr_groups && this.g.attr_groups.length > 0) {
+				this.g.attr_groups.forEach(x => {
 					if (x.checkId != 0) {
 						sign.push(`${x.checkId}`);
 					}
@@ -321,9 +314,9 @@ export default {
 				if (sign.length == this.g.attr_groups.length - 1) {
 					this.formatDisable(sign);
 				} else if (sign.length == this.g.attr_groups.length) {
-        let t = sign.join(":");
+					let t = sign.join(':');
 					let len = -1;
-        this.g.attr.forEach((x) => {
+					this.g.attr.forEach(x => {
 						if (x.sign_id == t && x.stock == 0) {
 							len = this.g.attr_groups.length - 1;
 						}
@@ -336,14 +329,15 @@ export default {
 						this.formatDisable(sign.splice(sign.length - 1, 1));
 					}
 				}
+			}
 		},
 		formatDisable(sign) {
 			this.notStockGood = [];
-      this.g.attr.forEach((x) => {
+			this.g.attr.forEach(x => {
 				if (x.stock == 0) {
-          let t = x.sign_id.split(":");
+					let t = x.sign_id.split(':');
 					let t1 = [];
-          t.forEach((x) => {
+					t.forEach(x => {
 						if (sign.indexOf(x) == -1) {
 							t1.push(x);
 						}
@@ -356,39 +350,40 @@ export default {
 			this.$forceUpdate();
 		},
 		formatSku() {
-      let sign = "";
-      this.g.attr_groups.forEach((x) => {
-        if (x.checkId != 0) {
-          sign += (sign == "" ? "" : ":") + x.checkId;
+			let sign = '';
+			if (this.g.attr_groups && this.g.attr_groups.length > 0) {
+				this.g.attr_groups.forEach(x => {
+					if (x.checkId != -1) {
+						sign += (sign == '' ? '' : ':') + x.checkId;
 					}
 				});
-      this.g.attr.forEach((x) => {
+			}
+			if (this.g.attr && this.g.attr.length) {
+				this.g.attr.forEach(x => {
 					if (x.sign_id == sign) {
 						this.skuObj = x;
 					}
 				});
+			}
+
 			if (this.skuObj != null) {
 				this.goodimage = this.skuObj.pic_url || this.g.cover_pic;
-        this.goodprice = (
-          parseFloat(this.skuObj.price) * parseFloat(this.gc)
-        ).toFixed(2);
+				this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.gc)).toFixed(2);
 				this.goodamount = this.skuObj.stock;
 			}
 		},
 		// 弹窗关闭
 		popupClose() {
-      this.$emit("close", this.skuObj);
-      this.$emit("input", false);
+			this.$emit('close', this.skuObj);
+			this.$emit('input', false);
 		},
 		valChange(e) {
 			this.gc = e.value;
 			if (this.skuObj) {
-        this.goodprice = (
-          parseFloat(this.skuObj.price) * parseFloat(this.gc)
-        ).toFixed(2);
+				this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.gc)).toFixed(2);
+			}
+		}
 	}
-    },
-  },
 };
 </script>
 
@@ -417,7 +412,7 @@ export default {
 }
 .goodsku .goods .chosen-info .price {
 	font-size: 24px;
-  font-family: "oswald";
+	font-family: 'oswald';
 	font-weight: unset;
 }
 .goodsku .goods .chosen-info .price .small {

components/goods/style1.vue

@@ -46,7 +46,7 @@
         </div>
         <div class="good-price-info">
           <span class="price" :style="{ color: mainColor }">{{
-            goodsInfo.showGoodsPrice ? item.price : ""
+            goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
           }}</span>
           <span class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
             <u-icon

components/goods/style2.vue

@@ -43,7 +43,7 @@
             </view>
             <view class="good-price-info">
               <view class="price" :style="{'color':mainColor}">{{
-                goodsInfo.showGoodsPrice ? item.price : ""
+                goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
               }}</view>
               <view class="buy" v-if="goodsInfo.showBuyBtn">
                  <u-icon

components/goods/style3.vue

@@ -43,7 +43,7 @@
             </div>
             <div class="good-price-info">
               <view class="price" :style="{'color':mainColor}">{{
-                goodsInfo.showGoodsPrice ? item.price : ""
+                goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
               }}</view>
               <view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
                 <u-icon

components/goods/style4.vue

@@ -109,18 +109,18 @@ export default {
       this.showSku=true
     },
 	//格式化价格添加.00
-	getPrice(value){
-	  var html,_val;
-	  value =Number(value).toFixed(2);
-	  if(value==0){
-	   value=0;
-	   return html = "￥0";
-	  }else if(value.split('.')[1].substring(1)==0){
-	   value = Number(value).toFixed(2);
-	  }
-	  _val = value.split('.');
-	  return html = '￥'+_val[0]+'.'+_val[1];
-	}
+	// getPrice(value){
+	//   var html,_val;
+	//   value =Number(value).toFixed(2);
+	//   if(value==0){
+	//    value=0;
+	//    return html = "￥0";
+	//   }else if(value.split('.')[1].substring(1)==0){
+	//    value = Number(value).toFixed(2);
+	//   }
+	//   _val = value.split('.');
+	//   return html = '￥'+_val[0]+'.'+_val[1];
+	// }
   },
 };
 </script>

components/goods/style5.vue

@@ -40,9 +40,9 @@
         </view>
         <view class="good-price-info">
           <view class="price" :style="{'color':mainColor}">{{
-            goodsInfo.showGoodsPrice ? item.price : ""
+            goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
           }}</view>
-          <view class="buy" v-if="goodsInfo.showBuyBtn">
+          <view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
             <u-icon
               name="cart-o"
               size="40"
@@ -78,17 +78,22 @@
         </view>
       </view>
     </view>
-    <view style="color:rgba(0,0,0,0);font-size:12px;">0</view>
+    <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
   </view>
 </template>
-
 <script>
+import goodSku from '../goods/goodsku'
 export default {
+  components:{
+	goodSku
+  },
   props: ["goodList", "goodsInfo"],
   data() {
     return {
       mainColor: "",
       activeKey: 0,
+	  showSku:false,
+	  sku:{}
     };
   },
   created() {
@@ -98,6 +103,10 @@ export default {
     openGood(e) {
       console.log(e);
     },
+	showSkuHandler(g){
+	  this.sku=g
+	  this.showSku=true
+	},
   },
 };
 </script>

components/goods/style6.vue

@@ -38,7 +38,7 @@
         }}</view>
         <view class="good-price-info">
           <view class="price" :style="{'color':mainColor}">{{
-            goodsInfo.showGoodsPrice ? item.price : ""
+            goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
           }}</view>
           <view class="buy" v-if="goodsInfo.showBuyBtn">
             <u-icon

plugin/api.js

@@ -44,9 +44,9 @@ export default {
 					'content-type': "application/json"
 				},
 				data: {
-					"MallBaseId": 1,
-					"TenantId": 1,
-					"OpenId": this.GetOpenId().OpenId,
+					MallBaseId: 1,
+					TenantId: 1,
+					OpenId: this.GetOpenId().OpenId,
 					UserId:this.GetOpenId().UserId,
 					MiniAppId: this.GetMiniAppId(),
 					msg: param.data
@@ -97,6 +97,11 @@ export default {
 				return str;
 			}
 		}
+		//价格返回.00
+		Vue.prototype.getPrice = function(val){
+			val =Number(val).toFixed(2);
+			return val
+		}
 
 		Vue.prototype.apiheader = function() {
 			return {