1.修改首页中石化码券跳转

high-unionPay/pages/goods/goods-list/goods-list.vue

@@ -9,7 +9,7 @@
 			<view class="swiper-box">
 				<swiper circular="true" autoplay="true" @change="swiperChange">
 					<swiper-item v-for="swiper in swiperList" :key="swiper.id">
-						<image :src="imageUrl+swiper.imgData"	></image>
+						<image :src="imageUrl+swiper.imgData"></image>
 					</swiper-item>
 				</swiper>
 				<view class="indicator">
@@ -30,18 +30,23 @@
 
 				<view class="info mart10">
 					<view class="price" v-if="row.payType != 1">
-						<image style="width: 15px;height: 15px;vertical-align: sub;"
+						<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
-							src="../../../static/img/jfx.png">
 						</image> {{ row.discountPrice*100}}
 					</view>
-					<view class="price"  v-else>
+					<view class="price" v-else>
 						￥ {{ row.discountPrice}}
 					</view>
 					<!-- v-if="product.discountPrice !== product.salesPrice" -->
 					<view class="slogan" v-if="row.discountPrice !== row.salesPrice">
-						<image v-if="row.payType != 1" style="width: 15px;height: 15px;vertical-align: sub;"
+						<!-- <image v-if="row.payType != 1" style="width: 15px;height: 15px;vertical-align: sub;"
 							src="../../../static/img/jfh.png">
-						</image> <text v-else>￥</text>{{ row.salesPrice*100}}
+						</image>{{ row.salesPrice*100}} <text v-else>￥</text>{{row.salesPrice}} -->
+						<view v-if="row.payType != 1">
+							<image style="width: 15px;height: 15px;vertical-align: sub;"
+								src="../../../static/img/jfh.png">
+							</image>{{ row.salesPrice*100}}
+						</view>
+						<view v-else>￥{{ row.salesPrice}}</view>
 					</view>
 				</view>
 			</view>
@@ -62,7 +67,7 @@
 			return {
 				goodsList: [],
 				imagewxUrl: app.globalData.imageWxImg,
-				imgadres:'noorder.png',
+				imgadres: 'noorder.png',
 				imageUrl: app.globalData.imgUrl,
 				// 轮播图片
 				swiperList: [{
@@ -82,7 +87,7 @@
 				isNoMoreData: false,
 				typeId: '',
 				couponName: '',
-				brandid : '',
+				brandid: '',
 				goodtyid: ''
 			};
 		},
@@ -106,6 +111,13 @@
 				this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
 			}
 			if (option.id == 3) {
+				uni.setNavigationBarTitle({
+					title: '中石化码列表'
+				});
+				this.getCouponListArea();
+				this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
+			}
+			if (option.id == 4) {
 				uni.setNavigationBarTitle({
 					title: '优选商品'
 				});
@@ -149,7 +161,6 @@
 				let pagenum = this.pageNum;
 				let params = {
 					regionId: app.globalData.cityId,
-					// regionId: '510000',
 					pageNum: pagenum,
 					pageSize: this.pageSize,
 					displayArea: this.typeId,
@@ -206,9 +217,9 @@
 				this.pageSize = 10;
 				this.isNoMoreData = false;
 				this.goodsList = [];
-				if(this.typeId == 3){
+				if (this.typeId == 4) {
 					this.getBrandCouponList();
-				}else{
+				} else {
 					this.getCouponListArea();
 				}
 			},
@@ -319,12 +330,12 @@
 	}
 
 	.goodsxg {
-	margin-top: 5px;
+		margin-top: 5px;
-	    border: 1px solid #eb5823;
+		border: 1px solid #eb5823;
-	    border-radius: 5px;
+		border-radius: 5px;
-	    color: #eb5823;
+		color: #eb5823;
-	    width: 55px;
+		width: 55px;
-	    padding: 3px;
+		padding: 3px;
 	}
 
 	.info {

high-unionPay/subPages/brand-classification/brand-classification.vue

@@ -77,7 +77,7 @@
 			// 跳转商品
 			jumpgoods(item){
 				uni.navigateTo({
-					url:'../../pages/goods/goods-list/goods-list?id=3'+'&goodsId='+this.desId+'&brandId='+item
+					url:'../../pages/goods/goods-list/goods-list?id=4'+'&goodsId='+this.desId+'&brandId='+item
 				})
 			}
 		}