From 26d52368a2bf465c3d1cc3745d7b2668eab0d0eb Mon Sep 17 00:00:00 2001
From: zhouzhenyuan <zhouzhenyuan>
Date: Sat, 3 Feb 2024 15:53:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                     | 16 ++++++++++
 pages/goods/detail.vue         | 56 +++++++++++++++++++++++-----------
 pages/news/rules/index.vue     | 38 +++++++++++++++++++++++
 pages/news/rules/rulesList.vue | 55 +++++++++++++++++++++++++++++++++
 pages/news1/help.vue           | 14 +++++++--
 pages/sureOrder/index.vue      | 43 ++++++++++++++------------
 6 files changed, 182 insertions(+), 40 deletions(-)
 create mode 100644 pages/news/rules/index.vue
 create mode 100644 pages/news/rules/rulesList.vue

diff --git a/pages.json b/pages.json
index bef6559..3c2a220 100644
--- a/pages.json
+++ b/pages.json
@@ -512,6 +512,22 @@
 						"enablePullDownRefresh": false
 					}
 				},
+				{
+					"path": "rules/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "rules/rulesList",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
 				{
 					"path": "article/detail",
 					"style": {
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index e5478d7..e61a16d 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -20,19 +20,6 @@
 					</swiper-item>
 
 				</swiper>
-				<!-- <scroll-view class="goods" scroll-x="true" @scroll="scroll">
-					<view class="goodsItem" v-for="(item,index) in goods.goods_images" :key="index">
-						<image :src="item.preview_url" mode="" class="goodsImg"></image>
-						<view class="num">
-							<view class="numSp">
-
-							</view>
-							<view class="numInfo">
-								{{index+1}}/{{allPicture}}
-							</view>
-						</view>
-					</view>
-				</scroll-view> -->
 			</view>
 		</view>
 
@@ -74,8 +61,8 @@
 					{{goods.goods_name}}
 				</view>
 				<view class="goodsOpera">
-					<view class="goodsNum" @click="copyNum" v-if="goods.skuList.length>0">
-						<text>{{goods.skuList[0].goods_sku_no}}</text>
+					<view class="goodsNum" @click="copyNum" >
+						<text>{{goods.skuList[0].goods_sku_id}}</text>
 						<image src="/static/detail/copy.png" mode=""></image>
 					</view>
 					<view class="operaImg">
@@ -103,7 +90,7 @@
 						<image src="../../static/detail/rightIcon.png" mode=""></image>
 					</view>
 					<view class="address">
-						河北省秦皇岛市某某区
+						{{}}
 					</view>
 				</view>
 			</view>
@@ -295,6 +282,7 @@
 	import * as GoodsApi from '@/api/goods'
 	import * as goodsCar from '@/api/cart.js'
 	import SkuPopup from './components/SkuPopup'
+	import * as address from '@/api/address.js'
 	export default {
 		components: {
 			SkuPopup
@@ -314,7 +302,8 @@
 				goods: {},
 				suggestGoodsList: [],
 				userInfo: {},
-
+				addressList:[],
+				addressInfo:{},
 			}
 		},
 		onLoad(options) {
@@ -322,11 +311,42 @@
 			this.getGoodsDetail(options.goodsId)
 		},
 		onShow() {
+			this.getAddressList()
 			this.getSuggestGoods()
-			this.userInfo = uni.getStorageSync('userInfo')
+			this.userInfo = uni.getStorageSync('userInfo');
+			
 		},
 		methods: {
 			// 选择商品规格
+			getAddressList(){
+				const that = this
+				return new Promise((resolve, reject) => {
+					address.list().then(res => {
+							if (res.code == 200) {
+								that.addressList = res.data.list
+								console.log('58555559999')
+								that.getDefaultAddress()
+							}
+						})
+						.catch()
+				})
+			},
+			getDefaultAddress() {
+				console.log('5855555')
+				const that = this
+				return new Promise((resolve, reject) => {
+					address.defaultId().then(res => {
+							if (res.code == 200) {
+								for (var i = 0; i < that.addressList.length; i++) {
+									if (res.data.defaultId == that.addressList[i].address_id) {
+										that.addressInfo = that.addressList[i]
+									}
+								}
+							}
+						})
+						.catch()
+				})
+			},
 			choseSku() {
 				this.showSkuPopup = true
 			},
diff --git a/pages/news/rules/index.vue b/pages/news/rules/index.vue
new file mode 100644
index 0000000..10d3ffb
--- /dev/null
+++ b/pages/news/rules/index.vue
@@ -0,0 +1,38 @@
+<template>
+	<view class="pages">
+		<view class="header">
+			<u-navbar is-back="false" :title="title" ></u-navbar>
+		</view>
+		<view class="content">
+			<rich-text :nodes="strings"></rich-text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				title:'',
+				strings:'',
+				itemInfo:{}
+			}
+		},
+		onLoad(options){
+			this.itemInfo = JSON.parse(options.itemInfo)
+			this.title = this.itemInfo.title;
+			this.strings = this.itemInfo.content;
+		},
+		methods:{
+			
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.pages{
+		width: 100%;
+		height: 100%;
+		padding: 30rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/news/rules/rulesList.vue b/pages/news/rules/rulesList.vue
new file mode 100644
index 0000000..dabe8a8
--- /dev/null
+++ b/pages/news/rules/rulesList.vue
@@ -0,0 +1,55 @@
+<template>
+	<view class="pages">
+		<view class="header">
+			<u-navbar is-back="false" :title="title" ></u-navbar>
+		</view>
+		<view class="content">
+			<view v-for="(item,index) in list" :key="index" class="item">
+				<view class="title" @click="goRules(item)">
+					{{item.title}}
+				</view>
+				
+				<u-line />
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				title:'',
+				list:[],
+				itemInfo:{}
+			}
+		},
+		onLoad(options){
+			this.itemInfo = JSON.parse(options.itemInfo)
+			this.title = this.itemInfo.name
+			this.list = this.itemInfo.child
+		},
+		methods:{
+			goRules(item){
+				uni.navigateTo({
+					url:'/pages/news/rules/index?itemInfo='+JSON.stringify(item)
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.pages{
+		width: 100%;
+		height: 100%;
+		padding: 30rpx;
+	}
+	.item{
+		margin-bottom: 28rpx;
+	}
+	.title{
+		margin-bottom: 28rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/news1/help.vue b/pages/news1/help.vue
index 26df32d..909bc71 100644
--- a/pages/news1/help.vue
+++ b/pages/news1/help.vue
@@ -3,7 +3,7 @@
 		<view class="helpContent">
 			<view class="helpTitle">帮助中心</view>
 			<view class="helpItem" v-for="(item,index) in itemList" :key="index">
-				<view class="helpMain">
+				<view class="helpMain" @click="goListPage(item)">
 					<u-icon name="arrow-left" class="zhishi" color="#dfdbdb" size="28"></u-icon>
 					<image :src="item.img_url" class="titleIcon" mode="widthFix"></image>
 					<view class="mainText">
@@ -47,6 +47,11 @@
 			this.getHelpList()
 		},
 		methods: {
+			goListPage(item){
+				uni.navigateTo({
+					url:'/pages/news/rules/rulesList?itemInfo='+JSON.stringify(item)
+				})
+			},
 			getHelpList() {
 				const that = this
 				help.helpList()
@@ -59,8 +64,11 @@
 					.finally(() => that.isLoading = false)
 			},
 			openContent(item) {
-				this.strings = item.content
-				this.dialog = true
+				uni.navigateTo({
+					url:'/pages/news/rules/index?itemInfo='+JSON.stringify(item)
+				})
+				// this.strings = item.content
+				// this.dialog = true
 			},
 		}
 	}
diff --git a/pages/sureOrder/index.vue b/pages/sureOrder/index.vue
index 07aa581..68675ae 100644
--- a/pages/sureOrder/index.vue
+++ b/pages/sureOrder/index.vue
@@ -5,14 +5,16 @@
 				:background="background"></u-navbar>
 		</view>
 		<view class="buyType">
-			<view class="toDoor" :style="{'background':buyType=='sm'?'#fff':'rgba(255, 255, 255, 0.57)'}">
+			<view class="toDoor" @click="choseType('sm')"
+				:style="{'background':buyType=='sm'?'#fff':'rgba(255, 255, 255, 0.57)','height':buyType=='zq'?'88rpx':'78rpx'}">
 				送货上门
 			</view>
-			<view class="bySelf">
+			<view class="bySelf" @click="choseType('zq')"
+				:style="{'background':buyType=='zq'?'#fff':'rgba(255, 255, 255, 0.57)','height':buyType=='zq'?'88rpx':'78rpx'}">
 				到店自取
 			</view>
 		</view>
-		<view class="address" v-if="buyType">
+		<view class="address" v-if="buyType!='sm'">
 			<view class="addAddress">
 				请点击添加收货地址
 			</view>
@@ -240,34 +242,37 @@
 	export default {
 		data() {
 			return {
-				buyType: false,
+				buyType: 'sm',
 				background: {
 					background: 'url(' + img + ') center top no-repeat',
 					backgroundSize: '100% auto',
 				},
 				goodsInfo: {},
-				shopInfo:{},
-				addressList:[],
-				addressInfo:{}
+				shopInfo: {},
+				addressList: [],
+				addressInfo: {}
 			}
 		},
 		onLoad(options) {
-			if(options.goodsInfo){
+			if (options.goodsInfo) {
 				this.goodsInfo = JSON.parse(options.goodsInfo)
 			}
 		},
 		onShow() {
 			this.getGoodsInfo()
 			this.getAddressList();
-			
+
 		},
 		methods: {
-			getDefaultAddress(){
+			choseType(val) {
+				this.buyType = val
+			},
+			getDefaultAddress() {
 				return new Promise((resolve, reject) => {
 					address.defaultId().then(res => {
-							if(res.code==200){
-								for(var i=0;i<that.addressList.length;i++){
-									if(res.data.defaultId==that.addressList[i].address_id){
+							if (res.code == 200) {
+								for (var i = 0; i < that.addressList.length; i++) {
+									if (res.data.defaultId == that.addressList[i].address_id) {
 										that.addressInfo = that.addressList[i]
 										that.getOrderInfo()
 									}
@@ -277,11 +282,11 @@
 						.catch()
 				})
 			},
-			getOrderInfo(){
+			getOrderInfo() {
 				const that = this
 				return new Promise((resolve, reject) => {
 					address.list().then(res => {
-							if(res.code==200){
+							if (res.code == 200) {
 								that.addressList = res.data.list
 								that.getDefaultAddress()
 							}
@@ -289,11 +294,11 @@
 						.catch()
 				})
 			},
-			getAddressList(){
+			getAddressList() {
 				const that = this
 				return new Promise((resolve, reject) => {
 					address.list().then(res => {
-							if(res.code==200){
+							if (res.code == 200) {
 								that.addressList = res.data.list
 								that.getDefaultAddress()
 							}
@@ -304,11 +309,11 @@
 			getGoodsInfo() {
 				return new Promise((resolve, reject) => {
 					storeShop.list().then(res => {
-							console.log(res,'获取店铺信息')
+							console.log(res, '获取店铺信息')
 						})
 						.catch()
 				})
-				
+
 			},
 			orderSubmit() {
 				const that = this