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

manifest.json

@@ -116,14 +116,14 @@
             "scope.userLocation" : {
                 "desc" : "获取当前所在城市位置"
             },
-			"makePhoneCall": {
-			  "desc": "用于拨打电话"
-			}
+            "makePhoneCall" : {
+                "desc" : "用于拨打电话"
+            }
         },
         "optimization" : {
             "subPackages" : true
         },
-        "requiredPrivateInfos" : [ "chooseAddress","getLocation" ]
+        "requiredPrivateInfos" : [ "chooseAddress", "getLocation" ]
     },
     "mp-alipay" : {
         "usingComponents" : true

pages/activity/charts.vue

@@ -60,12 +60,12 @@
 					</image>
 				</view>
 				<view class="rank_content" v-if="rankList.length>0">
-					<view class="rank_box" v-for="(item,index) in rankList"
+					<view class="rank_box" @click="toBack(item)" v-for="(item,index) in rankList"
 						:style="{ backgroundImage: 'url(' + (item.rankimage!=null?item.rankimage.external_url:'') + ')', }">
 						<view class="rank_name">
 							{{item.name}}榜
 						</view>
-						<view class="rank_go" @click="toBack(item.path)">
+						<view class="rank_go">
 							<text>GO</text>
 							<u-icon name="arrow-right" color="#fff" size="23"></u-icon>
 						</view>
@@ -131,12 +131,15 @@
 					this.rankList = data.list
 				}
 			},
-			toBack() {
+			toBack(item) {
 				// let pages = getCurrentPages();
 				// let beforePage = pages[pages.length - 2]
 				// console.log(this.removeAfter(pages, 'pages/activity/ranking'))
-				uni.redirectTo({
-					url: '/pages/activity/ranking'
+				// uni.redirectTo({
+				// 	url: '/pages/activity/ranking'
+				// })
+				uni.navigateTo({
+					url: '/pages/activity/charts?categoryId=' + item.category_id + '&name=' + item.name
 				})
 			},
 			removeAfter(arr, value) {

pages/index/index.vue

@@ -103,7 +103,7 @@
 
 					</view>
 				</view>
-				<view class="dapai">
+				<view class="dapai" v-if="dapaiList && dapaiList.length>0">
 					<!-- <image src="/static/index/dapaibg.png" mode="widthFix" class="dapaibg"></image> -->
 					<view class="dapaiBox">
 						<view class="dapaiTitle">
@@ -136,7 +136,7 @@
 
 					</view>
 				</view>
-				<view class="qianggou" v-if="seckillList.length>0">
+				<view class="qianggou" v-if="seckillList && seckillList.length>0">
 					<view class="title" @click="seckill">
 						<image :src="$picUrl+'/static/index/limitBuy.png'" mode="widthFix"></image>
 						<view class="more">查看更多<u-icon style="margin-left:10rpx;" name="arrow-right"></u-icon>
@@ -158,7 +158,7 @@
 							</u-count-down>
 						</view>
 					</view>
-					<view class="goods-list">
+					<view class="goods-list" v-if="seckillList && seckillList.length>0">
 						<view class="list" v-for="(item, index) in seckillList" :key="index"
 							@click="handleTargetGoods(item.goods_id)">
 							<view class="pictrue">

pages/news1/wallet.vue

@@ -51,7 +51,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="getData">
+		<view class="getData" :style="{'z-index': OrderType == ''?'1':'3'}">
 			<view class="order-tab">
 				<view class="tab" :class="{'action':OrderType==''}" @click="onOrderTab('')">
 					<text>全部</text>
@@ -256,10 +256,11 @@
 </script>
 <style lang="scss" scoped>
 	page {
-		// min-height: calc(100vh);
-		min-height: 100%;
+		min-height: calc(100vh);
+		// min-height: 100%;
 		background: #fff !important;
-
+		overflow-x: hidden;
+		overflow-y: scroll;
 		.wallet {
 			height: 100%;
 			position: relative;
@@ -616,6 +617,8 @@
 		}
 
 		.dataList {
+			position: relative;
+			z-index: 2;
 			.empty {
 				// margin:0 auto;
 				// text-align: center;

pages/order/detail.vue

@@ -143,10 +143,14 @@
 			<view class="fd">
 				共{{ order.total_num }}件商品，实付款￥<text>{{ order.pay_price?Number(order.pay_price):order.pay_price }}</text>
 			</view>
-			<view class="line" v-if="order.pay_status == PayStatusEnum.PENDING.value">
+			<view class="line" 
+			v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
+			
+			>
 			</view>
-			<view class="cancel" @click="onCancel(order.order_id)"
-				v-if="order.pay_status == PayStatusEnum.PENDING.value">
+			<view class="cancel" @click="onCancel(order.order_id)"
+				v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
+				>
 				取消订单
 			</view>
 		</view>
@@ -171,7 +175,7 @@
 					{{order.pay_method_text}}
 				</view>
 			</view>
-			<view class="orderTitle">
+			<!-- <view class="orderTitle">
 				<view class="total">
 					商品快照：
 				</view>
@@ -181,7 +185,7 @@
 				<view class="copy">
 					查看
 				</view>
-			</view>
+			</view> -->
 			<view class="orderTitle" v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
 				<view class="total" v-if="order.delivery[0].delivery_method != DeliveryMethodEnum.UNWANTED.value">
 					物流公司：
@@ -316,7 +320,12 @@
 					v-if="order.order_status == OrderStatusEnum.COMPLETED.value && order.is_comment == 0"
 					@click="handleTargetComment(order.order_id)">
 					评价
-				</view> -->
+				</view> -->
+				<view class="buyAgain" @click="onCopyOrderInfo(order)"
+					style="width: 200rpx;color:#fff;background: linear-gradient( 180deg, #FD5D06 0%, #F3211A 100%);"
+					>
+					复制订单详情
+				</view>
 			</view>
 
 		</view>
@@ -431,7 +440,7 @@
 		onShareAppMessage(res) {
 			return {
 				title: this.Store.storeInfo.store_name,
-				path: "pages/order/detail?orderId="+this.orderId, //这是打开后的跳转路径
+				path: "/pages/order/detail?orderId="+this.orderId, //这是打开后的跳转路径
 				imageUrl:this.Store.storeInfo.image_url,
 				 success: function(res){
 				          // 转发成功之后的回调
@@ -449,7 +458,42 @@
 				        }
 			}
 		},
-		methods: {
+		methods: {
+			onCopyOrderInfo(obj) {
+				console.log(obj)
+				/**
+				 * 1.订单编号:
+					2.商品型号:
+					3.商品编码:
+					4.商品单价:
+					5.商品数量:
+					6.商品总价:
+					7.收件人名字:
+					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)
+				uni.setClipboardData({
+					data: str,
+					success() {
+						uni.getClipboardData({
+							success() {
+								uni.showToast({
+									icon: "none",
+									title: "复制成功"
+								})
+							}
+						})
+					}
+				})
+			},
 			// 联系商家
 			callStore(phone) {
 				uni.makePhoneCall({
@@ -512,14 +556,14 @@
 
 			// 跳转到门店详情页
 			handleTargetExtract(shopId) {
-				this.$navTo('pages/shop/detail', {
+				this.$navTo('/pages/shop/detail', {
 					shopId
 				})
 			},
 
 			// 跳转到物流跟踪页面
 			handleTargetExpress() {
-				this.$navTo('pages/order/express/index', {
+				this.$navTo('/pages/order/express/index', {
 					orderId: this.orderId
 				})
 			},
@@ -527,12 +571,12 @@
 			// 跳转到商品详情页面
 			handleTargetGoods(goodsId) {
 				uni.redirectTo({
-					url: 'pages/goods/detail?goodsId=' + goodsId // 目标页面路径
+					url: '/pages/goods/detail?goodsId=' + goodsId // 目标页面路径
 				})
 			},
 			// 修改地址
 			onAdress(orderId) {
-				this.$navTo('pages/address/index', {
+				this.$navTo('/pages/address/index', {
 					orderId
 				})
 			},
@@ -628,14 +672,14 @@
 			},
 			// 点击去支付
 			onPay(orderId) {
-				this.$navTo('pages/checkout/cashier/index', {
+				this.$navTo('/pages/checkout/cashier/index', {
 					orderId
 				})
 			},
 
 			// 跳转到订单评价页
 			handleTargetComment(orderId) {
-				this.$navTo('pages/order/comment/index', {
+				this.$navTo('/pages/order/comment/index', {
 					orderId
 				})
 			},