Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/goods/detail.vue

@@ -758,6 +758,7 @@
 							}
 							info.content = info.content
 								.replace(/style=""/g, '')
+								.replace(/<img " src=/g, '<img src=')
 								.replace(/<img src=/g, '<img style="width: 100%; display:block" src=')
 							// that.goods = info;
 							Object.keys(info).forEach(item => {

pages/login/index.vue

@@ -114,9 +114,7 @@ export default {
       that.showCountDown = !that.showCountDown;
       
       CaptchaApi.sendSmsCaptcha({
-        form: {
-          mobile: that.phoneNum,
-        },
+          mobile: that.phoneNum
       }).then((res) => {
         if (res.status == 200) {
 			that.countDownFun = setInterval(() => {

pages/news1/setting.vue

@@ -65,13 +65,20 @@
 				<u-icon style="margin-left: 5rpx; color: #8A8A8A" name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<view class="box" style="padding: 0	40rpx;margin-bottom: 140rpx;" @click="onOut">
+		<view class="box" style="padding: 0	40rpx;" @click="onOut">
 			<view class="box-avter conten-height" style="border: none;">
 				<view class="name-text">
 					注销账号
 				</view>
 			</view>
 		</view>
+		<view class="box" style="padding: 0	40rpx;margin-bottom: 140rpx;" @click="onOut1">
+			<view class="box-avter conten-height" style="border: none;">
+				<view class="name-text">
+					退出登录
+				</view>
+			</view>
+		</view>
 		<view class="bottomBtn">
 			<!--  @click="sureSubmit" -->
 			<button class="submitBtn"  formType="submit">确认修改</button>
@@ -188,6 +195,28 @@ export default {
 				}
 			})
 		},
+		onOut1() {
+			uni.showModal({
+				title: '您是否要退出登录？',
+				content: '',
+				success(o) {
+					if (o.confirm) {
+						uni.showToast({
+							title: '退出成功',
+							icon: 'none',
+							duration: 2000
+						})
+						uni.clearStorage() 
+						uni.clearStorageSync()
+						setTimeout(function () {
+							uni.navigateBack({
+								delta: 1
+							})
+						}, 2000);
+					}
+				}
+			});
+		},
 		onOut() {
 			uni.showModal({
 				title: '您是否要注销账号？',

pages/order/detail.vue

@@ -321,7 +321,7 @@
 					@click="handleTargetComment(order.order_id)">
 					评价
 				</view> -->
-				<view class="buyAgain" @click="onCopyOrderInfo(order)"
+				<view class="buyAgain" v-if="userInfo.user_type == 40" @click="onCopyOrderInfo(order.copy_text)"
 					style="width: 200rpx;color:#fff;background: linear-gradient( 180deg, #FD5D06 0%, #F3211A 100%);"
 					>
 					复制订单详情
@@ -408,7 +408,8 @@
 				canReset: false,
 				cdDia: false,
 				menushow: false,
-				Store:''
+				Store:'',
+				userInfo: {}
 			}
 		},
 		/**
@@ -422,6 +423,7 @@
 			// 获取当前订单信息
 			this.getOrderDetail()
 			this.Store=uni.getStorageSync('Store')
+			this.userInfo = uni.getStorageSync("userInfo")
 			// 注册全局事件订阅: 是否刷新当前订单数据
 			uni.$on('syncRefresh', (val, isCur) => {
 				if (!isCur) {
@@ -472,16 +474,16 @@
 					8.收件人电话:
 					9.收件人地址:
 				 */
-				let goods_no = "";
-				if(obj.goods && obj.goods.length > 0){
-					obj.goods.map(a=>{
-						goods_no+=`商品型号: ${(a.goods_sku_id !=0?a.goods_sku_id:'无')};商品编码: ${a.goods_no?a.goods_no:'无编码'};商品单价: ￥${a.goods_price}元;商品数量: ${a.total_num};商品总价: ￥${a.total_price}元`
-					})
-				}
-				const str =`订单编号：${obj.order_no};${goods_no};收件人名字：${obj.address.name};收件人电话：${obj.address.phone};收件人地址：${obj.address.region.province+obj.address.region.city+obj.address.region.region+obj.address.detail};`
-				console.log(str)
+				// let goods_no = "";
+				// if(obj.goods && obj.goods.length > 0){
+				// 	obj.goods.map(a=>{
+				// 		goods_no+=`商品型号: ${(a.goods_sku_id !=0?a.goods_sku_id:'无')};商品编码: ${a.goods_no?a.goods_no:'无编码'};商品单价: ￥${a.goods_price}元;商品数量: ${a.total_num};商品总价: ￥${a.total_price}元`
+				// 	})
+				// }
+				// const str =`订单编号：${obj.order_no};${goods_no};收件人名字：${obj.address.name};收件人电话：${obj.address.phone};收件人地址：${obj.address.region.province+obj.address.region.city+obj.address.region.region+obj.address.detail};`
+				// console.log(str)
 				uni.setClipboardData({
-					data: str,
+					data: obj,
 					success() {
 						uni.getClipboardData({
 							success() {

pages/order/index.vue

@@ -24,7 +24,7 @@
 			<view class="item" v-for="(item,index) in list" v-if="list.length>0">
 				<view class="hd">
 					<view class="a">
-						<image class="icon" :src="item.storeInfo.image_url"></image>
+						<image class="icon" v-if="item.storeInfo && item.storeInfo.image_url" :src="item.storeInfo.image_url"></image>
 						{{item.storeInfo.store_name}}
 					</view>
 					<view class="b"

pages/user/index.vue

@@ -492,7 +492,7 @@
 							数据统计
 						</view>
 					</view>
-					<view class="serveIcon" @click="goManagementHandle('/pages/news/user/vip','会员管理')"
+					<view class="serveIcon" @click="goManagementHandle('/pages/news/user/vip?type=1','会员管理')"
 						v-if="userInfo.user_type == 40">
 						<image :src="$picUrl+'/static/user/hygl.png'" class="icons"></image>
 						<view class="serveInfo">