Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/mallplus

mallplusui-uniapp-app/pages/index/index.vue

@@ -1,19 +1,6 @@
 <template>
 	<view class="container">
-		<!-- 小程序头部兼容 -->
-		<!-- #ifdef MP -->
-		<nav-bar>汇融云链</nav-bar>
-		<view class="MP-search" @click="search()" style=""><input class="MP-search-input" type="text" disabled="true"
-				placeholder="输入关键字搜索" /></view>
-		<!-- #endif -->
-
-		<!-- 头部轮播 -->
-		<!-- #ifdef MP -->
-		<view class="carousel-section" style="margin-top: 80upx;">
-			<!-- #endif -->
-			<!-- #ifndef MP -->
 		<view class="carousel-section">
-				<!-- #endif -->
 			<!-- 标题栏和状态栏占位符 -->
 			<view class="titleNview-placing"></view>
 			<!-- 背景色区域 -->
@@ -34,11 +21,11 @@
 		<!-- 分类 -->
 		<view class="cate-section">
 			<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isFenxiao=1')">
-					<image src="/static/temp//antFill-gift.png"></image>
+				<image src="/static/nywz_icon.png"></image>
 				<text>农业物资</text>
 			</view>
 			<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isVip=1')">
-					<image src="/static/temp/fasfausers.png"></image>
+				<image src="/static/shwz_icon.png"></image>
 				<text>生活物资</text>
 			</view>
 			<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
@@ -46,7 +33,7 @@
 				<text>拼团特价</text>
 			</view>
 			<view class="cate-item" @click="navToTabPage('/pagesU/notice/subjectList')">
-					<image src="/static/temp/antFill-home.png"></image>
+				<image src="/static/njfw_icon.png"></image>
 				<text>农机服务</text>
 			</view>
 			<!-- 	<view class="cate-item" @click="navToTabPage('../../pagesA/build/communityList')">
@@ -206,7 +193,7 @@
 				<text class="title clamp">{{ item.productName }}</text>
 				<view>
 					<text class="price">惠农价￥{{ item.price }}</text>
-						<text class="m-price"> 县区商超价￥{{ item.price }}</text>
+					<!-- <text class="m-price"> 县区商超价￥{{ item.price }}</text> -->
 				</view>
 
 
@@ -229,10 +216,10 @@
 				<view class="image-wrapper">
 					<image :src="item.pic" mode="aspectFill"></image>
 				</view>
-					<text class="title clamp">{{ item.name }}</text>
+				<text class="title clamp">{{ item.productName }}</text>
 				<view>
 					<text class="price">惠农价￥{{ item.price }}</text>
-						<text class="m-price">县区商超价￥{{ item.price }}</text>
+					<!-- <text class="m-price">县区商超价￥{{ item.price }}</text> -->
 				</view>
 
 			</view>
@@ -254,14 +241,13 @@
 					<image :src="item.pic" mode="aspectFill"></image>
 				</view>
 				<text class="title clamp">{{ item.name }}</text>
-					<text class="label">【{{ item.storeName }}】</text>
+				<!-- <text class="label">【{{ item.storeName }}】</text> -->
 				<text class="price">惠农价￥{{ item.price }}</text>
 			</view>
 			<uni-load-more :status="loadingType"></uni-load-more>
 		</view>
 		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
-	</view>
 </template>
 
 <script>
@@ -314,6 +300,7 @@
 			this.getNewProductList();
 		},
 		onPullDownRefresh() {
+
 			console.log("onPullDownRefresh")
 			this.pageNum = this.pageNum + 1;
 			this.getNewProductList('refresh');
@@ -446,6 +433,7 @@
 			 * 加载首页数据
 			 */
 			async loadData() {
+
 				this.getBanner();
 				this.getHotGoodsList();
 				//this.getFlashPromotion();
@@ -453,6 +441,18 @@
 				this.getStoreList();
 				this.homeNewProduct();
 				this.homeRecommendProduct();
+
+				uni.getSystemInfo({
+					success: res => {
+						console.log("屏幕宽度", res.windowWidth)
+					}
+				})
+				uni.createSelectorQuery().in(this).select(".carousel-section").boundingClientRect(data => {
+					console.log("屏幕宽度", data.height)
+					// {"id":"","dataset":{},"left":12,"right":308,"top":12,"bottom":315,"width":296,"height":303}
+				}).exec(function(res) {
+					// 注意：exec方法必须执行，即便什么也不做，否则不会获取到任何数据
+				})
 			},
 
 			/**

mallplusui-uniapp-app/pagesA/product/groupList.vue

@@ -18,7 +18,7 @@
 				<text class="title clamp">{{ item.goods.name }}</text>
 				<view class="price-box">
 					<text class="price">{{ item.groupPrice }}</text>
-					<text>原价 {{ item.goods.price }}</text>
+					<!-- <text>原价 {{ item.goods.price }}</text> -->
 				</view>
 			</view>
 		</view>
@@ -395,11 +395,11 @@ page,
 		color: $font-color-light;
 	}
 	.price {
-		font-size: $font-lg;
+		font-size: 26upx;
 		color: $uni-color-primary;
 		line-height: 1;
 		&:before {
-			content: '￥';
+			content: '惠农团购价￥';
 			font-size: 26upx;
 		}
 	}

mallplusui-uniapp-app/pagesA/product/list.vue

@@ -19,18 +19,18 @@
 			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
 				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
 				<text class="title clamp">{{ item.name }}</text>
-				<view class="price-box" v-if="item.isFenxiao == 1">
+				<view class="price-box" >
 					<text class="price">{{ item.price }}</text>
 					<!-- <text>佣金 ¥{{ item.fenxiaoPrice }}</text> -->
 				</view>
-				<view class="price-box" v-if="item.isVip == 1">
+				<!-- <view class="price-box" v-if="item.isVip == 1">
 					<text class="price">会员价{{ item.vipPrice }}</text>
 					<text>商品价 ¥{{ item.price }}</text>
-				</view>
-				<view class="price-box" v-else-if="item.isFenxiao == 0 && item.isVip == 0">
+				</view> -->
+				<!-- <view class="price-box" v-else-if="item.isFenxiao == 0 && item.isVip == 0">
 					<text class="price">{{ item.price }}</text>
 					<text>已售 {{ item.sale }}</text>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<!-- 列表显示 -->
@@ -457,12 +457,12 @@ page,
 		color: $font-color-light;
 	}
 	.price {
-		font-size: $font-lg;
+		font-size: 26upx;
 		color: $uni-color-primary;
 		line-height: 1;
 		&:before {
 			content: '惠农价￥';
-			font-size: $font-lg;
+			font-size: 26upx;
 		}
 	}
 }

mallplusui-uniapp-app/pagesA/product/product.vue

@@ -16,7 +16,7 @@
 				<text class="price" v-else-if="!goods.vipPrice">惠农价¥{{ goods.price }}</text>
 				<text class="m-price" v-if="!goods.vipPrice">县区商超价{{ goods.originalPrice }}</text>
 				<text class="m-price" v-else-if="goods.vipPrice && goods.vipPrice > 0">¥{{ goods.price }}</text>
-				<text class="price">优惠¥{{ goods.originalPrice- goods.price }}</text>
+				<text class="price">优惠¥{{ (goods.originalPrice- goods.price) | formatNumber}}</text>
 				<text class="coupon-tip" v-if="goods.memberRate && goods.memberRate != 10">会员折扣{{ goods.memberRate }}折</text>
 			</view>
 			<view class="bot-row">
@@ -376,6 +376,10 @@ export default {
 		formatCreateTime(time) {
 			let date = new Date(time);
 			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		},
+		
+		formatNumber(number) {
+			return new Number(number).toFixed(2);
 		}
 	},
 	methods: {

mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue

@@ -70,9 +70,7 @@ export default {
 			favorite: true,
 			shareList: [],
 
-			desc: `
-
-				`,
+			desc: "",
 			skuList: []
 		};
 	},
@@ -89,7 +87,12 @@ export default {
 			if (data) {
 				let detailData = data;
 				this.detailData = detailData;
-				this.desc = data.content;
+				
+				var richtext=  data.content;
+				const regex = new RegExp('<img', 'gi');
+				richtext = richtext.replace(regex, `<img style="max-width:100%;height:auto;display:block;"`);
+				this.desc = richtext;
+				
 				uni.setNavigationBarTitle({
 					title: detailData.name
 				});