From acda32368d3d61cf0361fd299a642b1592db7ce8 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 18 Jul 2024 18:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             |  7 ++++-
 package/pages/zysc/member/order.vue |  6 ++--
 pages/videoCircle/index.vue         | 45 ++++++++++++++++++++++++++++-
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/App.vue b/App.vue
index 08f0e71..ad8a472 100644
--- a/App.vue
+++ b/App.vue
@@ -415,7 +415,12 @@
 				}
 			});
 			let userId = this.$queue.getData("userId")
-
+			// 商城配送方式 328
+			this.$Request.get('/app/common/type/328').then(res => {
+				if (res.code == 0) {
+					this.$queue.setData('peisongSel', res.data.value);
+				}
+			});
 			if (userId) {
 				this.$Request.getT('/app/user/selectUserById').then(res => {
 
diff --git a/package/pages/zysc/member/order.vue b/package/pages/zysc/member/order.vue
index 13cc188..0d4deb7 100644
--- a/package/pages/zysc/member/order.vue
+++ b/package/pages/zysc/member/order.vue
@@ -67,8 +67,8 @@
 				<view style="font-size: 30upx;color: #333333;width: 25%;">配送方式</view>
 				<view style="font-size: 30upx;color: #000000;margin-left: 10upx;width: 40%;">
 					<picker mode="selector" :range="WayList" @change="WaySel">
-						<view v-if="sendName === '请选择配送方式'" style="color: #000000;">{{sendName}}</view>
-						<view v-else>{{sendName}}</view>
+						<view style="color: #000000;">{{sendName?sendName:'请选择配送方式'}}</view>
+						<!-- <view v-else>{{sendName}}</view> -->
 					</picker>
 				</view>
 			</view>
@@ -194,9 +194,7 @@
 		},
 		methods: {
 			WaySel(e) {
-				// this.sendId = this.WayListTwo[e.detail.value].id;
 				this.sendName = this.WayList[e.detail.value];
-				
 				if (this.sendName === '快递') {
 					this.sendWay = 1;
 					this.postagePrice = this.postagePrices;
diff --git a/pages/videoCircle/index.vue b/pages/videoCircle/index.vue
index f61f957..da85e97 100644
--- a/pages/videoCircle/index.vue
+++ b/pages/videoCircle/index.vue
@@ -182,11 +182,54 @@
 				// 播放器下标
 				activeIndex: 0,
 				// 记录上一个播放器下标
-				oldActiveIndex: 0
+				oldActiveIndex: 0,
+				page:1,
+				limit:10,
 			}
 		},
 		onReady() {},
+		onLoad() {
+			this.jiukou()
+		},
 		methods: {
+			jiukou(){
+				var data={
+					page:1,
+					limit:10,
+					// id:'1',
+					shipinquanId:'1'
+				}
+				uni.request({
+					url: 'https://bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.bspapp.com/video',
+					method: 'POST',
+					data:{
+						info: 'get_video'
+					},
+					success: (res) => {
+						var msg = res.data.data
+					}
+				})
+				// this.$Request.getT('/app/shipinquan/list',data).then(res => {
+				// 	if (res.code == 0) {
+				// 	}
+				// });
+				// this.$Request.post('/app/shipinquan/add',data).then(res => {
+				// 	if (res.code == 0) {
+				// 	}
+				// });
+				// this.$Request.post('/app/shipinquan/delete',data).then(res => {
+				// 	if (res.code == 0) {
+				// 	}
+				// });
+				// this.$Request.post('/app/shipinquan/addContent',data).then(res => {
+				// 	if (res.code == 0) {
+				// 	}
+				// });
+				// this.$Request.getT('/app/shipinquan/contentlist',data).then(res => {
+				// 	if (res.code == 0) {
+				// 	}
+				// });
+			},
 			qiehuan(e) {
 				if (this.oldActiveIndex < e.detail.current) {
 					if (this.oldActiveIndex - e.detail.current != -2) {