修改细节

api/user.js

@@ -62,3 +62,7 @@ export const personal = (data, option) => {
 export const editUser = (data, option) => {
   return request.post('user/editUser', data, option)
 }
+//// 修改个人信息（头像昵称）
+export const wxHeadImgUpload = (data, option) => {
+  return request.post('upload/wxHeadImgUpload', data, option)
+}

pages/cart/index.vue

@@ -81,7 +81,7 @@
 						<text style="font-size: 20rpx;">￥</text>
 						<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_max}}</text>
 						<text style="font-size: 20rpx;margin-left:10rpx;">到手价</text>
-						<text style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_max}}</text>
+						<text style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
 					</view>
 					<!-- <view class="comment">
 						<text>{{item.goods_sales}}条评论</text>

pages/goods/detail.vue

@@ -23,7 +23,8 @@
 					</swiper-item>
 				</swiper>
 				<view class="dots" v-if="goods.goods_images && goods.goods_images.length> 0">
-					{{(currenIndex+1)+"/"+goods.goods_images.length}}</view>
+					{{(currenIndex+1)+"/"+goods.goods_images.length}}
+				</view>
 			</view>
 		</view>
 
@@ -210,14 +211,14 @@
 				</view>
 			</view>
 
-			<view class="fooRight2" style="width: 300rpx;" v-if="isLogin && userInfo.user_type == 40">
+			<view class="fooRight" v-if="isLogin && userInfo.user_type == 40">
 				<template v-if="goods.status == 20">
 					<view class="btn-bg">
 						已下架
 					</view>
 				</template>
 				<template v-else>
-					<view class="btn-bg" v-if="goods.spec_type == 20" style="background-color: #FF1D1D;"
+					<view class="btn-bg" v-if="goods.spec_type == 20" style="background-color: #FF1D1D;wi"
 						@click="choseSku(3)">
 						修改价格
 					</view>
@@ -740,19 +741,16 @@
 			},
 			copyNum(msg) {
 				uni.setClipboardData({
-					data: msg,
+					data: (typeof msg=='number')?msg.toString():msg, //	这里是个坑接受字符串类型 value转化为字符串
 					success: function() {
-						uni.getClipboardData({
+						//调用方法成功
-							success: function(res) {
+						uni.showToast({
-								console.log(res.data);
+							title: '复制成功',
-								uni.showToast({
+							icon: 'none',
-									icon: "none",
+							duration: 2000
-									title: "复制成功"
+						})
-								})
-							}
-						});
 					}
-				});
+				})
 			},
 			// 获取商品信息
 			getGoodsDetail(type) {

pages/index/index1.vue

@@ -234,7 +234,7 @@
 									<text lines="1" class="text_14">¥</text>
 									<text lines="1" class="text_15">{{item.goods_price_min}}</text>
 									<text lines="1" class="text_16">到手价</text>
-									<text lines="1" class="text_17">¥{{item.line_price_max}}</text>
+									<text lines="1" class="text_17">¥{{item.line_price_min}}</text>
 								</view>
 								<!-- <text lines="1" decode="true" class="text_18">200+条评论&nbsp;99%好评率</text> -->
 							</view>

pages/news/goods/batchdel.vue

@@ -10,7 +10,7 @@
 		</view>
 		<view class="goods-bd">
 			<view class="li" v-for="(i,index) in list" :key="index" v-if="list.length>0">
-				<view class="b">
+				<view class="b" @click="goDetails(i)">
 					<view class="item">
 						<view class="pic">
 							<image mode="aspectFill" :src="i.goods_image" />
@@ -58,6 +58,11 @@
 			};
 		},
 		methods: {
+			goDetails(item) {
+				uni.navigateTo({
+					url: '/pages/goods/detail?goodsId=' + item.goods_id
+				})
+			},
 			toPage() {
 				uni.navigateTo({
 					url: "/pages/news/goods/del"

pages/news/goods/del.vue

@@ -16,11 +16,11 @@
 							<image mode="aspectFill" v-if="!i.checked" :src="$picUrl+'/static/invoice/select.png'" />
 							<image mode="aspectFill" v-else :src="$picUrl+'/static/invoice/select-on.png'" />
 						</view>
-						<view class="pic">
+						<view class="pic" @click="goDetails(i)">
 							<image mode="aspectFill" :src="i.goods_image" />
 						</view>
 						<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
-						<view class="info">
+						<view class="info" @click="goDetails(i)">
 							<view class="title">{{i.goods_name}}</view>
 							<view class="sku">
 								{{i.selling_point}}
@@ -32,7 +32,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="a">
+				<view class="a" @click="goDetails(i)">
 					<view class="status">商品状态：{{i.status==10?'上架':i.status==20?'下架':'未知'}}</view>
 				</view>
 			</view>
@@ -67,6 +67,11 @@
 			};
 		},
 		methods: {
+			goDetails(item) {
+				uni.navigateTo({
+					url: '/pages/goods/detail?goodsId=' + item.goods_id
+				})
+			},
 			selectItem(item, index) {
 				if (this.list[index].checked) { //取消选中
 					if (this.checkedList.indexOf(item.goods_id) != -1) {

pages/news/goods/list.vue

@@ -7,7 +7,7 @@
 			</view>
 		</view>
 		<view class="goods-bd">
-			<view class="li" v-for="(i,index) in list" :key="index" v-if="list.length>0">
+			<view class="li" v-for="(i,index) in list" :key="index" v-if="list.length>0" @click="goDetails(i)">
 				<view class="b">
 					<view class="item">
 						<view class="pic">
@@ -56,6 +56,11 @@
 			}
 		},
 		methods: {
+			goDetails(item) {
+				uni.navigateTo({
+					url: '/pages/goods/detail?goodsId=' + item.goods_id
+				})
+			},
 			getListAfter() {
 				this.list = [];
 				this.getList()

pages/news/rules/index.vue

@@ -19,7 +19,7 @@
 			}
 		},
 		onLoad(options){
-			this.itemInfo = JSON.parse(options.itemInfo)
+			this.itemInfo = JSON.parse(decodeURIComponent(options.itemInfo))
 			this.title = this.itemInfo.title;
 			this.strings = this.itemInfo.content;
 		},
@@ -34,5 +34,8 @@
 		width: 100%;
 		height: 100%;
 		padding: 30rpx;
+		span{
+			white-space: normal !important
+		}
 	}
 </style>

pages/news1/help.vue

@@ -84,7 +84,7 @@
 			},
 			openContent(item) {
 				uni.navigateTo({
-					url: '/pages/news/rules/index?itemInfo=' + JSON.stringify(item)
+					url: '/pages/news/rules/index?itemInfo=' + encodeURIComponent(JSON.stringify(item))
 				})
 			},
 		}
@@ -94,11 +94,10 @@
 <style lang="scss" scoped>
 	page {
 		min-height: 100%;
-		padding-bottom: 160rpx;
 	}
 
 	.help {
-
+		padding-bottom: 160rpx;
 		height: 100%;
 
 		.helpContent {

pages/news1/text.vue

@@ -2,7 +2,7 @@
 	<view> 
 		<!-- <view class="con">{{ content }}</view> -->
 		<view class="con">
-			<mp-html :content="content" />
+			<rich-text style="white-space: normal;" :nodes="content"></rich-text>
 		</view>
 	</view>
 </template>
@@ -49,7 +49,10 @@ export default {
 
 .con {
 	font-size: 28rpx;
-	padding: 20rpx 40rpx 40rpx;
+	padding: 20rpx 40rpx;
 	line-height: 28px;
+	span{
+		white-space: normal !important
+	}
 }
 </style>

pages/news3/LogisticsDetails.vue

@@ -11,7 +11,7 @@
 				</view>
 				<view class="logis-text">
 					<text>物流单号：</text>{{logisticsItem.express_no}}<text
-						style="color: #FF6565; font-size:15px;margin-left: 20px;" @click="copy">复制</text>
+						style="color: #FF6565; font-size:28rpx;margin-left: 20px;" @click="copy">复制</text>
 				</view>
 			</view>
 		</view>
@@ -118,7 +118,7 @@
 		// background-color: #FFF;
 		display: flex;
 		align-items: center;
-		padding: 30px;
+		padding: 40rpx;
 
 		image {
 			width: 60px;
@@ -132,9 +132,9 @@
 
 		.logis-pany {
 			overflow: hidden;
-			margin-left: 15px;
+			margin-left: 15rpx;
 			color: #000;
-			font-size: 14px;
+			font-size: 28rpx;
 
 			text {
 				color: #999;

pages/user/index.vue

@@ -532,7 +532,7 @@
 							<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_max}}</text>
 							<text style="font-size: 20rpx;margin-left:10rpx;">到手价</text>
 							<text
-								style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_max}}</text>
+								style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
 						</view>
 						<!-- <view class="comment">
 							<text>{{item.goods_sales}}条评论</text>
@@ -611,6 +611,7 @@
 		},
 		methods: {
 			onChooseAvatar(e) {
+				let that = this
 				uni.getUserProfile({
 					desc: 'Wexin', // 这个参数是必须的
 					success: res => {
@@ -618,9 +619,49 @@
 						this.userInfo.avatar_url = rawData.avatarUrl;
 						this.userInfo.nick_name = rawData.nickName;
 						console.log("用户信息", JSON.parse(res.rawData))
+						if (rawData) {
+							that.headImgUpload(rawData.avatarUrl, rawData.nickName)
+						} else {
+							return that.$toast('获取失败')
+						}
+
 					}
 				})
 			},
+			nickSubmit(avatar_id,nick_name) {
+				UserApi.editUser({
+						avatar_id: avatar_id,
+						nick_name: nick_name
+					})
+					.then(res => {
+						if (res.status == 200) {
+							uni.showToast({
+								title: '获取成功',
+								icon: 'none',
+								duration: 2000
+							})
+							this.getUserInfo()
+						} else {
+							uni.showToast({
+								title: '获取失败',
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.finally()
+			},
+			headImgUpload(avatarUrl, nickName) {
+				// 获取推荐商品
+				const that = this
+				UserApi.wxHeadImgUpload({
+						headImg: avatarUrl,
+						checkLogin: 1
+					})
+					.then(res => {
+						that.nickSubmit(res.data.fileInfo.file_id, nickName)
+					})
+			},
 			goShopOrderList() {
 				uni.navigateTo({
 					url: '/pages/news3/shopOrder?delivery_type=10'