11

components/qiandao/index.vue

@@ -3,7 +3,7 @@
 		<image src="/static/images/qiandao.png" mode="aspectFill"></image>
 		<text>签到成功</text>
 		<text>获得积分+ {{}}</text>
-		<view class="btn">确定</view>
+		<view class="btn" @click="close">确定</view>
 	</view>
 </template>
 
@@ -28,7 +28,9 @@
 			
 		},
 		methods: {
-			
+			close() {
+				this.$emit('close')
+			}
 		}
 	}
 </script>

components/yx-picker/picker-city.vue

@@ -0,0 +1,237 @@
+<template>
+	<view>
+		<view class="appAuth" @click="onShowProvince"></view>
+		<block v-if="enable">
+			<view class="picker-view" :class="{pickerViewA:anims}">
+				<view class="picker-view__pane">
+					<text @click="cityCancel">取消</text>
+					<text @click="citySure">确认</text>
+				</view>
+				<picker-view class="pick-view__group" @change="cityChange" @pickstart="chooseStart" @pickend="chooseEnd" :value="pickerValue">
+					<picker-view-column indicator-class="item_active">
+						<view v-for="item in provinces" class="picker-item" :key="item.id" :data-id="item.id">{{item.name}}</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view v-for="item in citys" class="picker-item" :key="item.id" :data-id="item.id">{{item.name}}</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view v-for="item in areas" class="picker-item" :key="item.id" :data-id="item.id">{{item.name}}</view>
+					</picker-view-column>
+				</picker-view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import $api from '@/static/js/api.js'
+	export default {
+		name: "picker-city",
+		props: {
+			p_c_a: {
+				type: [Object,String,Boolean],
+				default: {},
+			},//省、市、区 用于记忆查询
+		},
+		data() {
+			return {
+				id: 0,
+				enable:false,
+				anims:false,
+				pickerValue: [0, 0, 0], // 地址选择器省市区 暂存 currentIndex
+				provinces:[],	// 省 一级地址
+				citys: [], 		// 市 二级地址
+				areas: [], 		// 区 三级地址
+				isCanConfirm: true //是否禁止在第一列滚动期间点击确定提交数据
+			};
+		},
+		created() {
+			let that=this;
+			that.getcity()
+		},
+		methods:{
+			getcity() {
+				var that = this
+				$api.req({
+					url: 'area',
+					method: 'GET',
+					data: {
+						parent_id: that.id
+					}
+				}, function(res) {
+					that.provinces = res.data
+					
+				})
+			},
+			// 显示选择器
+			async onShowProvince(){
+				console.log('显示地址选择器');
+				let p_c_a=this.p_c_a;
+				let that=this;
+				/* if(p_c_a && (p_c_a.p_name || p_c_a.c_name || p_c_a.a_name)){
+					that.provincePicker(p_c_a);
+				}else{
+					that.initPick();
+				} */
+				that.initPick();
+				that.enable=true;
+				that.$nextTick(()=>{
+					that.anims=true;
+				})
+			},
+			// 隐藏选择器
+			async onHideProvince(){
+				let that=this
+				that.anims=false
+				setTimeout(function() {
+					that.pickerValue=[0,0,0]
+					that.enable=false
+				}, 350);
+			},
+			// 初始选择器
+			initPick(){
+				// 默认联动显示北京
+				var that = this
+				var id = that.provinces[0].id
+				$api.req({
+					url: 'area',
+					method: 'GET',
+					data: {
+						parent_id: id
+					}
+				}, function(res2) {
+					that.citys = res2.data
+					$api.req({
+						url: 'area',
+						method: 'GET',
+						data: {
+							parent_id: that.citys[0].id
+						}
+					}, function(res3) {
+						that.areas = res3.data
+						
+					})
+				})
+			},
+			// 
+			chooseStart(e) {
+				this.isCanConfirm=false
+			},
+			chooseEnd(e) {
+				this.isCanConfirm=true
+			},
+			cityChange(e) {
+			    let arr = e.detail.value;
+				// console.log("arr: " + JSON.stringify(arr));
+			    let provinceNum = arr[0];
+			    let cityNum = arr[1];
+			    let areaNum = arr[2];
+				var p_id = provinces[provinceNum].id;
+			    if (this.pickerValue[0] !== provinceNum) {
+					this.pickerValue=[provinceNum, 0, 0];
+					this.citys=citys[p_id];
+					this.areas=areas[citys[p_id][0].id]
+			    } else if (this.pickerValue[1] !== cityNum) {
+			        var c_id = citys[p_id][cityNum].id;
+					this.pickerValue=[provinceNum, cityNum, 0];
+					this.areas=areas[c_id];
+			    } else {
+					this.pickerValue=[provinceNum, cityNum, areaNum];
+			    }
+			},
+			// 点击地区选择取消按钮
+			cityCancel(e) {
+			    this.onHideProvince()
+			},
+			// 点击地区选择确定按钮
+			citySure(e) {
+			    if (this.isCanConfirm) {
+			        var arr = this.pickerValue
+					let obj={
+						provinces: this.provinces[arr[0]] || null,
+						city: this.citys[arr[1]] || null,
+						area: this.areas[arr[2]] || null,
+					}
+					console.log("省市区: " + JSON.stringify(obj));
+					this.$emit('confirm', obj)
+					this.onHideProvince()
+			    }
+			},
+			// 记忆查询 地址逆解析
+			async provincePicker({p_name='',c_name='',a_name=''}){
+				let that=this
+				var arr_picker=[0,0,0]
+				var p_id=provinces.find((item,index)=>item.name==p_name || item.fullname==p_name).id
+				arr_picker[0]=provinces.findIndex(item=>item.name==p_name || item.fullname==p_name)
+				
+				var c_id=citys[p_id].find((item,index)=>item.name==c_name || item.fullname==c_name).id
+				arr_picker[1]=citys[p_id].findIndex(item=>item.name==c_name || item.fullname==c_name)
+				
+				var a_id=areas[c_id].find((item,index)=>item.name==a_name || item.fullname==a_name).id
+				arr_picker[2]=areas[c_id].findIndex(item=>item.name==a_name || item.fullname==a_name)
+				
+				this.provinces=provinces;
+				this.citys=citys[p_id];
+				this.areas=areas[c_id];
+				
+				that.$nextTick(()=>{
+					that.pickerValue=arr_picker
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.appAuth{
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		opacity: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 100;
+	}
+	/* 地区级联选择器 */
+	.picker-view {
+		position: fixed;
+		width: 100%;
+		display: flex;
+		background-color: #ffffff;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		left: 0rpx;
+		bottom: -100%;
+		transition: all 0.35s linear;
+		border-top: 1rpx solid #eeeeee;
+	}
+	.pickerViewA{
+		bottom: 0rpx;
+	}
+	.picker-item {
+		line-height: 70rpx;
+		margin-left: 5rpx;
+		margin-right: 5rpx;
+		text-align: center;
+	}
+	.picker-view__pane {
+		height: 100rpx;
+		width: 100%;
+		padding: 20rpx 32rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+	}
+	.picker-view__pane text {
+		color: #00cc88;
+		font-size: 30rpx;
+	}
+	.pick-view__group {
+		width: 96%;
+		height: 450rpx;
+	}
+</style>

components/yx-vip/index.vue

@@ -10,24 +10,24 @@
 			</view>
 			<view class="btn hflex acenter" v-if="showsign" @click="tosign">
 				<image src="/static/images/rili.png" mode="aspectFill"></image>
-				<text>{{user.is_qiandao ? '签到' : '已签到'}}</text>
+				<text>{{user.is_qiandao ? '已签到' : '签到'}}</text>
 			</view>
 		</view>
 		<view class="level hflex acenter jbetween" v-if="showlevel">
-			<text>LV{{user.level}}</text>
+			<text>LV{{user.level || 1}}</text>
 			<u-line-progress :percentage="user.already_upgrade_rate * 100" inactiveColor="#CCCCCC" height="2" activeColor="#FFFFFF"></u-line-progress>
-			<text>LV{{Number(user.level) + 1}}</text>
+			<text>LV{{Number(user.level) + 1 || 2}}</text>
 		</view>
 		<view class="bottom hflex acenter jbetween">
 			<text>{{user.is_vip ? user.vip_expired_at : '开通会员享福利'}}</text>
-			<text @click="show_buy = true">{{user.is_vip ? '立即续费' : '立即开通'}}</text>
+			<text @click="show_buy = false">{{user.is_vip ? '立即续费' : '立即开通'}}</text>
 		</view>
 		<u-popup :show="show" mode="center" @close="toclose">
 			<view class="qiandao vflex acenter jcenter">
 				<image src="/static/images/qiandao.png" mode="aspectFill"></image>
 				<text>签到成功</text>
 				<text>获得积分+ {{jifen}}</text>
-				<view class="btn">确定</view>
+				<view class="btn" @click="show = false">确定</view>
 			</view>
 		</u-popup>
 		<u-popup :show="show_buy" mode="bottom" @close="toclose" :round="16">
@@ -104,12 +104,15 @@
 				this.show_buy = false
 			},
 			tosign() {
+				var _this = this
 				$api.req({
 					url: 'sign',
 					method: 'POST'
 				}, function(res) {
 					if(res.code == 10000) {
 						_this.show = true
+					} else if(res.code == 20001) {
+						uni.$u.toast('请先登录')
 					}
 				})
 			},

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "yixiang",
+    "name" : "忆象",
     "appid" : "__UNI__97674D1",
     "description" : "",
     "versionName" : "1.0.0",
@@ -41,11 +41,14 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "oauth" : {},
-                "payment" : {}
+                "payment" : {},
+                "ad" : {}
             }
         },
         "nativePlugins" : {

pageB/components/addressbox.vue

@@ -8,14 +8,16 @@
 		<view class="list vflex">
 			<u-radio-group  placement="column" @change="selectaddress">
 				<view class="list-item hflex acenter jbetween" v-for="(item,index) in list" :key="index" @click="select(index)">
-					<u-radio shape="circle" :name="index" activeColor="#00B0B0"></u-radio>
-					<view class="left vflex">
-						<view class="address2">{{item.province}}{{item.city}}{{item.area}}{{item.address}}</view>
-						<view class="hflex acenter item-bottom">
-							<text>{{item.name}}</text>
-							<text class="mobile">{{item.mobile}}</text>
-							<view class="default" v-if="item.is_default == 1">默认</view>
-						</view> 
+					<view class="hflex acenter jcenter">
+						<u-radio shape="circle" :name="index" activeColor="#00B0B0"></u-radio>
+						<view class="left vflex">
+							<view class="address2">{{item.province}}{{item.city}}{{item.area}}{{item.address}}</view>
+							<view class="hflex acenter item-bottom">
+								<text>{{item.name}}</text>
+								<text class="mobile">{{item.mobile}}</text>
+								<view class="default" v-if="item.is_default == 1">默认</view>
+							</view> 
+						</view>
 					</view>
 					<image src="../static/edit.png" mode="aspectFill" @click="edit(item)"></image>
 				</view>	

pageB/components/youhui.vue

@@ -15,6 +15,10 @@
 					</view>
 					<u-radio shape="circle" :name="index" activeColor="#00B0B0"></u-radio>
 				</view>	
+				<view class="list-item hflex acenter jbetween" :class="active == 0 ? 'active-item' : ''" @click="select('0')" v-if="type == 'vip'">
+					<view class="name">使用</view>
+					<u-radio shape="circle" :name="0" activeColor="#00B0B0"></u-radio>
+				</view>
 				<view class="list-item hflex acenter jbetween" :class="active == -1 ? 'active-item' : ''" @click="select('-1')">
 					<view class="name">不使用</view>
 					<u-radio shape="circle" :name="-1" activeColor="#00B0B0"></u-radio>
@@ -34,13 +38,26 @@
 			list: {
 				typeof: Array,
 				default: []
+			},
+			type: {
+				typeof: String,
+				default: ''
+			},
+			index: {
+				typeof: Number,
+				default: -1
 			}
 		},
 		data() {
 			return {
-				active: -1
+				active: '',
 			}
 		},
+		watch: {
+			index(newvalue,oldvalue) {
+				this.active = newvalue
+			},
+		},
 		onLoad() {
 			
 		},

pageB/good-detail.vue

@@ -1,13 +1,16 @@
 <template>
 	<view class="good-detail">
-		<u-swiper :list="detail.imgs" @change="e => currentNum = e.current" height="375" :autoplay="false" indicatorStyle="right: 20px">
+		<u-swiper :list="detail.images" @change="e => currentNum = e.current" height="375" :autoplay="false" indicatorStyle="right: 20px">
 			<view slot="indicator" class="indicator-num">
-				<text class="indicator-num__text hflex acenter jcenter">{{ currentNum + 1 }}/{{ detail.imgs.length }}</text>
+				<text class="indicator-num__text hflex acenter jcenter">{{ currentNum + 1 }}/{{ detail.images.length }}</text>
 			</view>
 		</u-swiper>
 		<view class="detail">
 			<view class="box">
 				<view class="price">{{detail.price}}<text>积分</text></view>
+				<view class="name">
+					{{detail.name}}
+				</view>
 			</view>
 			<view class="box hflex acenter jbetween" @click="spec_show = true">
 				<view class="label">选择</view>
@@ -15,20 +18,20 @@
 				<view class="text" v-else>请先选择规格</view>
 				<u-icon name="arrow-right" color="#000" size="20"></u-icon>
 			</view>
-			<u-parse :content="detail.content"></u-parse>
+			<u-parse :content="detail.detail"></u-parse>
 		</view>
 		<view class="bottom hflex acenter jbetween">
-			<view class="vflex acenter jcenter collect">
+			<view class="vflex acenter jcenter collect" @click="tocollect">
 				<u-icon name="star" color="#000" size="22" v-if="!detail.is_collect"></u-icon>
 				<u-icon name="star-fill" color="#00B0B0" size="22" v-if="detail.is_collect"></u-icon>
-				<text>收藏</text>
+				<text>{{detail.is_collect ? '已收藏' : '收藏'}}</text>
 			</view>
 			<view class="btn" @click="toconfirm">立即兑换</view>
 		</view>
 		<u-popup :show="spec_show" mode="bottom" :round="10" @close="toclose">
 			<view class="spec-popu">
 				<view class="spec-top hflex jbetween">
-					<image :src="detail.cover" mode="aspectFill"></image>
+					<image :src="detail.image" mode="aspectFill"></image>
 					<view class="vflex jbetween top-center">
 						<view class="spec-price">{{detail.price}}<text>积分</text></view>
 						<view class="spec-text" v-if="active != -1">已选择：“{{detail.speclist[active].name}}”</view>
@@ -44,11 +47,11 @@
 				</view>
 				<view class="spec-num hflex acenter jbetween">
 					<view class="spec-title">数量</view>
-					<u-number-box v-model="detail.num" :integer="true">
-						<view slot="minus" class="minus" :class="detail.num == 1 ? 'minus2' : ''">
+					<u-number-box v-model="num" :integer="true">
+						<view slot="minus" class="minus" :class="num == 1 ? 'minus2' : ''">
 							<u-icon name="minus" size="12" color="#FFFFFF"></u-icon>
 						</view>
-						<input slot="input" class="input" v-model="detail.num"></input>
+						<input slot="input" class="input" v-model="num"></input>
 						<view slot="plus" class="minus">
 							<u-icon name="plus" color="#FFFFFF" size="12"></u-icon>
 						</view>
@@ -69,7 +72,8 @@
 				detail: {},
 				currentNum: 0,
 				active: -1,
-				spec_show: false
+				spec_show: false,
+				num: 1,
 			}
 		},
 		onLoad(options) {
@@ -77,13 +81,27 @@
 			this.getdata()
 		},
 		methods: {
+			tocollect() {
+				var _this = this
+				$api.req({
+					url: 'integral/goods/'+ _this.id + '/collect',
+					method: 'POST',
+				}, function(res) {
+					if(res.code == 10000) {
+						uni.$u.toast(res.msg)
+						_this.detail.is_collect = !_this.detail.is_collect
+					} else {
+						uni.$u.toast(res.msg)
+					}
+				})
+			},
 			toconfirm() {
-				if(this.active == -1) {
+				/* if(this.active == -1) {
 					$api.info('请先选择规格')
 					return
-				}
+				} */
 				uni.navigateTo({
-					url: '/pageB/order-confirm'
+					url: '/pageB/order-confirm?good=' + JSON.stringify(this.detail) + '&num=' + this.num
 				})
 			},
 			/* 点击确定 */
@@ -101,45 +119,16 @@
 			},
 			/* 获取详情 */
 			getdata() {
-				this.detail = {
-					imgs: [
-						'https://dummyimage.com/750x750/e3e3e3/fff',
-						'https://dummyimage.com/750x750/e3e3e3/fff',
-						'https://dummyimage.com/750x750/e3e3e3/fff',
-					],
-					cover: 'https://dummyimage.com/750x750/e3e3e3/fff',
-					price: 13850,
-					name: 'Apple iPhone 15 Pro Max (A3108) 256GB 原色钛金属 支持移动联通电信5G 双卡双待手机',
-					is_collect: false,
-					num: 1,
-					content: ``,
-					speclist: [
-						{
-							id: 1,
-							name: '原色钛金属+256GB'
-						},
-						{
-							id: 1,
-							name: '原色钛金属+256GB'
-						},
-						{
-							id: 1,
-							name: '原色钛金属+256GB'
-						},{
-							id: 1,
-							name: '原色钛金属+256GB'
-						},{
-							id: 1,
-							name: '原色钛金属+256GB'
-						},{
-							id: 1,
-							name: '原色钛金属+256GB'
-						},{
-							id: 1,
-							name: '原色钛金属+256GB'
-						},
-					],
-				}
+				var _this = this
+				$api.req({
+					url: 'integral/goods/' + this.id,
+					method: 'GET',
+				}, function(res) {
+					if(res.code == 10000) {
+						_this.detail = res.data
+					}
+				})
+				
 			},
 		}
 	}
@@ -314,6 +303,13 @@
 						font-weight: 500;
 					}
 				}
+				.name {
+					font-size: 32rpx;
+					font-family: SFPro, SFPro;
+					font-weight: 500;
+					color: #222222;
+					padding: 16rpx 0 0;
+				}
 				.label {
 					font-size: 26rpx;
 					font-family: PingFangSC, PingFang SC;

pageB/order-confirm.vue

@@ -12,14 +12,14 @@
 		<view class="box good">
 			<view class="title">商品</view>
 			<view class="hflex good-detail">
-				<image :src="detail.img" mode="aspectFill"></image>
+				<image :src="detail.image" mode="aspectFill"></image>
 				<view class="vflex center jbetween">
 					<view class="name text_hide2">{{detail.name}}</view>
 					<view class="spec">{{detail.spec}}</view>
 				</view>
 				<view class="right vflex aend">
 					<view class="price">{{detail.price}}积分</view>
-					<view class="num">X{{detail.num}}</view>
+					<view class="num">X{{num}}</view>
 				</view>
 			</view>
 			<view class="cell hflex acenter jbetween">
@@ -32,7 +32,7 @@
 			<view class="cell hflex acenter jbetween" @click="show_vip = true">
 				<view class="label">会员等级优惠</view>
 				<view class="hflex acenter">
-					<view class="value">{{vip_active == -1 ? '不使用' : vip_list[vip_active].tiaojian}}</view>
+					<view class="value">{{vip_active == -1 ? '不使用' : '使用'}}</view>
 					<image src="static/down.png" mode="aspectFill"></image>
 				</view>
 			</view>
@@ -52,7 +52,7 @@
 			</view>
 			<view class="hflex acenter jbetween cell">
 				<view class="label">实付积分</view>
-				<view class="value">{{detail.pay}}</view>
+				<view class="value">{{total}}</view>
 			</view>
 			<view class="hflex acenter jbetween cell">
 				<view class="label">备注信息</view>
@@ -61,17 +61,17 @@
 		</view>
 		<view style="height: 166rpx; "></view>
 		<view class="bottom hflex acenter jend">
-			<view class="money">总计<span class="money-text">{{detail.pay}}积分</span></view>
+			<view class="money">总计<span class="money-text">{{total}}积分</span></view>
 			<view class="btn" @click="submit">提交订单</view>
 		</view>
 		<u-popup :show="show_address" @close="toclose" mode="bottom" :round="13">
 			<addressBox :list="address_list" @close="toclose" @select="selectAddress"></addressBox>
 		</u-popup>
 		<u-popup :show="show_youhui" @close="toclose" mode="bottom" :round="13">
-			<youhui :list="youhui_list" @close="toclose" @select="selectyouhui"></youhui>
+			<youhui :index="youhui_active" :list="youhui_list" @close="toclose" @select="selectyouhui"></youhui>
 		</u-popup>
 		<u-popup :show="show_vip" @close="toclose" mode="bottom" :round="13">
-			<youhui :list="vip_list" @close="toclose" @select="selectvip"></youhui>
+			<youhui :index="vip_active" type="vip" :list="vip_list" @close="toclose" @select="selectvip"></youhui>
 		</u-popup>
 		<u-popup :show="show_submit" @close="toclose" mode="center" :round="10">
 			<view class="popu1 vflex acenter">
@@ -117,11 +117,17 @@
 				show_submit: false,
 				show_wx: false,
 				wxcode: 'https://dummyimage.com/750x750/e3e3e3/fff',
+				num: 0,
+				total: 0,
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			this.detail = JSON.parse(options.good)
+			console.log(this.detail)
+			this.num = options.num
+			console.log(this.num);
 			this.getlist()
-			this.getdata()
+			// this.getdata()
 		},
 		methods: {
 			
@@ -156,19 +162,7 @@
 				this.toclose()
 			}, 
 			getdata() {
-				this.detail = {
-					img: 'https://dummyimage.com/750x750/e3e3e3/fff',
-					cover: 'https://dummyimage.com/750x750/e3e3e3/fff',
-					price: 13850,
-					name: 'Apple iPhone 15 Pro Max (A3108) 256GB 原色钛金属 支持移动联通电信5G 双卡双待手机',
-					is_collect: false,
-					num: 1,
-					content: ``,
-					spec: '原色钛金属+256GB',
-					total: 13825,
-					youhui: 1000,
-					pay: 12825
-				}
+				
 			},
 			selectAddress(e) {
 				this.address = this.address_list[e]
@@ -182,39 +176,18 @@
 				this.show_wx = false
 			},
 			getlist() {
-				for(var i=0;i<5;i++) {
-					var data = {
-						id: i+1,
-						province: '湖南省',
-						city: '湘西土家族苗族自治州',
-						area: '吉首市',
-						address: '李时珍大道503号',
-						name: '牧茜梅',
-						mobile: '19876523456',
-						is_default: 1,
-					}
-					this.address_list.push(data)
-					var vip = {
-						title: '租赁设备优惠券',
-						price: '50',
-						tiaojian: '满1000元可用',
-						intro: '仅用于租赁设备时抵扣',
-						status: '1',
-						time: '2023.12.23',
-						type: '1'
+				var _this = this
+				$api.req({
+					url: 'address',
+					method: 'GET',
+					data: {
+						is_page: 0
 					}
-					this.vip_list.push(vip)
-					var youhui = {
-						title: '租赁设备优惠券',
-						price: '50',
-						tiaojian: '满1000元可用',
-						intro: '仅用于租赁设备时抵扣',
-						status: '1',
-						time: '2023.12.23',
-						type: '1'
+				}, function(res) {
+					if(res.code == 10000) {
+						_this.address_list = res.data
 					}
-					this.youhui_list.push(youhui)
-				}
+				})
 			},
 		}
 	}

pageC/address-add.vue

@@ -11,31 +11,55 @@
 		<view class="box">
 			<view class="cell hflex acenter">
 				<view class="label">收货人</view>
-				<u-input placeholder="请填写收货人姓名" :value="detail.name" border="none"></u-input>
+				<u-input placeholder="请填写收货人姓名" v-model="detail.name" border="none"></u-input>
 			</view>
 			<view class="cell hflex acenter">
 				<view class="label">手机号码</view>
-				<u-input placeholder="请填写收货人手机号码" :value="detail.mobile" border="none"></u-input>
+				<u-input placeholder="请填写收货人手机号码" v-model="detail.mobile" border="none"></u-input>
 			</view>
-			<view class="cell hflex acenter jbetween">
+			<view class="cell hflex acenter jbetween" @click="enable = true">
 				<view class="label">所在地区</view>
-				<u-input placeholder="请选择所在地区" :disabled="true" disabledColor="#FFFFFF" :value="detail.province + detail.city + detail.area" border="none"></u-input>
+				<u-input placeholder="请选择所在地区" :disabled="true" disabledColor="#FFFFFF" v-model="detail.province + detail.city + detail.area" border="none"></u-input>
 				<u-icon name="arrow-down" color="#777777" size="16"></u-icon>
+				
 			</view>
 			<view class="cell hflex acenter">
 				<view class="label">详细地址</view>
-				<u-input placeholder="请输入街道、楼牌号" :value="detail.address" border="none"></u-input>
+				<u-input placeholder="请输入街道、楼牌号" v-model="detail.address" border="none"></u-input>
 			</view>
 			<view class="cell hflex acenter jbetween">
 				<view class="label">设为默认地址</view>
 				<u-switch v-model="detail.is_default" activeColor="#00b0b0" @change="change"></u-switch>
 			</view>
 		</view>
-		<view class="btn">保存</view>
+		<view class="btn" @click="add">保存</view>
+		<view class="city-select" v-if="enable" @click="cityCancel">
+			
+			<block>
+				<view class="picker-view" @click.stop="initcity">
+					<view class="picker-view__pane">
+						<text @click.stop="cityCancel">取消</text>
+						<text @click.stop="citySure">确认</text>
+					</view>
+					<picker-view class="pick-view__group" @change="cityChange" @pickstart="chooseStart" @pickend="chooseEnd" :value="pickerValue">
+						<picker-view-column indicator-class="item_active">
+							<view v-for="item in provinces" class="picker-item" :key="item.id" :data-id="item.id">{{item.name}}</view>
+						</picker-view-column>
+						<picker-view-column>
+							<view v-for="item in citys" class="picker-item" :key="item.id" :data-id="item.id">{{item.name}}</view>
+						</picker-view-column>
+						<picker-view-column>
+							<view v-for="item in areas" class="picker-item" :key="item.id" :data-id="item.id">{{item.name}}</view>
+						</picker-view-column>
+					</picker-view>
+				</view>
+			</block>
+		</view>
 	</view>
 </template>
 
 <script>
+	import $api from '@/static/js/api.js'
 	export default {
 		data() {
 			return{
@@ -44,11 +68,20 @@
 					name: '',
 					mobile: '',
 					province: '',
+					province_id: '',
 					city: '',
+					city_id: '',
+					area: '',
 					area: '',
 					address: '',
 					is_default: false
-				}
+				},
+				provinces: [],
+				citys: [],
+				areas: [],
+				pickerValue: [0, 0, 0], 
+				enable: false,
+				isCanConfirm: true
 			}
 		},
 		onLoad(option) {
@@ -56,25 +89,156 @@
 				this.id = option.id
 				this.getdata()
 			}
+			this.getcity()
 		},
 		methods: {
+			initcity() {
+				this.enable = true
+			},
+			getcity() {
+				var that = this
+				$api.req({
+					url: 'area',
+					method: 'GET',
+					data: {
+						parent_id: 0
+					}
+				}, function(res) {
+					that.provinces = res.data
+					$api.req({
+						url: 'area',
+						method: 'GET',
+						data: {
+							parent_id: that.provinces[that.pickerValue[0]].id
+						}
+					}, function(res2) {
+						that.citys = res2.data
+						$api.req({
+							url: 'area',
+							method: 'GET',
+							data: {
+								parent_id: that.citys[that.pickerValue[1]].id
+							}
+						}, function(res3) {
+							that.areas = res3.data
+						})
+					})
+				})
+			},
+			cityCancel() {
+				this.enable = false
+			},
+			citySure() {
+				if (this.isCanConfirm) {
+					var arr = this.pickerValue
+					this.detail.province = this.provinces[arr[0]].name || null
+					this.detail.province_id = this.provinces[arr[0]].id || null
+					this.detail.city = this.citys[arr[1]].name || null
+					this.detail.city_id = this.citys[arr[1]].id || null
+					this.detail.area = this.areas[arr[2]].name || null
+					this.detail.area_id = this.areas[arr[2]].id || null
+					this.cityCancel()
+				}
+			},
+			cityChange(e) {
+				let arr = e.detail.value;
+				let provinceNum = arr[0];
+				let cityNum = arr[1];
+				let areaNum = arr[2];
+				if (this.pickerValue[0] !== provinceNum) {
+					this.pickerValue=[provinceNum, 0, 0];
+					this.getcity()
+				} else if (this.pickerValue[1] !== cityNum) {
+					this.pickerValue=[provinceNum, cityNum, 0];
+					this.getcity()
+				} else {
+					this.pickerValue=[provinceNum, cityNum, areaNum];
+				}
+			},
+			chooseStart(e) {
+				this.isCanConfirm=false
+			},
+			chooseEnd(e) {
+				this.isCanConfirm=true
+			},
 			del() {
+				var _this = this
 				uni.showModal({
 					title: '删除',
 					content: '是否确定要删除该地址',
 					success: function (res) {
 						if (res.confirm) {
-							console.log('用户点击确定');
+							$api.req({
+								url: 'address/' + _this.id,
+								method: 'DELETE'
+							}, function(res) {
+								if(res.code === 10000) {
+									uni.$u.toast(res.msg)
+									setTimeout(() => {
+										uni.navigateBack()
+									},2300)
+								}
+							})
 						} else if (res.cancel) {
 							console.log('用户点击取消');
 						}
 					}
 				});
 			},
-			getdata() {
-				this.detail = {
-					
+			add() {
+				var _this = this
+				if(!_this.detail.name) {
+					uni.$u.toast('请先输入姓名')
+				}
+				if(!_this.detail.mobile) {
+					uni.$u.toast('请先输入手机号')
 				}
+				if(!_this.detail.area) {
+					uni.$u.toast('请先选择地区')
+				}
+				if(!_this.detail.address) {
+					uni.$u.toast('请先输入详细地址')
+				}
+				$api.req({
+					url: _this.id ? 'address/' + _this.id :'address',
+					method: _this.id ? 'PUT' : 'POST',
+					data: {
+						name: _this.detail.name,
+						mobile: _this.detail.mobile,
+						province_id: _this.detail.province_id,
+						city_id: _this.detail.city_id,
+						district_id: _this.detail.area_id,
+						address: _this.detail.address,
+						is_default: _this.detail.is_default ? 1 : 0,
+					}
+				}, function(res) {
+					if(res.code == 10000) {
+						uni.$u.toast(res.msg)
+						setTimeout(() => {
+							uni.navigateBack()
+						},2000)
+					}
+				})
+			},
+			getdata() {
+				var _this = this
+				$api.req({
+					url: 'address/' + _this.id,
+					method: 'GET'
+				}, function(res) {
+					if(res.code == 10000) {
+						_this.detail.name = res.data.name
+						_this.detail.mobile = res.data.mobile
+						_this.detail.province_id = res.data.province_id
+						_this.detail.province = res.data.province_name
+						_this.detail.city_id = res.data.city_id
+						_this.detail.city = res.data.city_name
+						_this.detail.area_id = res.data.district_id
+						_this.detail.area = res.data.district_name
+						_this.detail.address = res.data.address
+						_this.detail.is_default = res.data.is_default == 1 ? true : false
+					}
+				})
 			}
 		}
 	}
@@ -117,5 +281,54 @@
 			text-align: center;
 			line-height: 88rpx;
 		}
+		
+		
+		.city-select {
+			position: fixed;
+			width: 100%;
+			height: 100%;
+			left: 0;
+			bottom: 0;
+			background: rgba(0, 0, 0, .2);
+		}
+		.picker-view {
+			position: fixed;
+			width: 100%;
+			display: flex;
+			background-color: #ffffff;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			left: 0rpx;
+			bottom: 0rpx;
+			transition: all 0.35s linear;
+			border-top: 1rpx solid #eeeeee;
+		}
+		.pickerViewA{
+			bottom: 0rpx;
+		}
+		.picker-item {
+			line-height: 70rpx;
+			margin-left: 5rpx;
+			margin-right: 5rpx;
+			text-align: center;
+		}
+		.picker-view__pane {
+			height: 100rpx;
+			width: 100%;
+			padding: 20rpx 32rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			box-sizing: border-box;
+		}
+		.picker-view__pane text {
+			color: #00cc88;
+			font-size: 30rpx;
+		}
+		.pick-view__group {
+			width: 96%;
+			height: 450rpx;
+		}
 	}
 </style>

pageC/address-list.vue

@@ -20,13 +20,17 @@
 </template>
 
 <script>
+	import $api from '@/static/js/api.js'
 	export default {
 		data() {
 			return{
-				list: []
+				list: [],
+				
 			}
 		},
 		onLoad() {
+		},
+		onShow() {
 			this.getlist()
 		},
 		methods: {
@@ -41,19 +45,16 @@
 				})
 			},
 			getlist() {
-				for(var i=0;i<5;i++) {
-					var data = {
-						id: i+1,
-						province: '湖南省',
-						city: '湘西土家族苗族自治州',
-						area: '吉首市',
-						address: '李时珍大道503号',
-						name: '牧茜梅',
-						mobile: '19876523456',
-						is_default: 1,
+				var _this = this
+				$api.req({
+					url: 'address',
+					method: 'GET',
+					data: {
+						is_page: 0
 					}
-					this.list.push(data)
-				}
+				}, function(res) {
+					_this.list = res.data
+				})
 			}
 		}
 	}
@@ -86,7 +87,7 @@
 		.box {
 			background: #FFFFFF;
 			border-radius: 16rpx;
-			padding: 24rpx 20rpx 0;
+			padding: 0 20rpx 0;
 			.address-item {
 				padding: 28rpx 0 ;
 				border-bottom: 1px solid #F1F7FE;

pages/index/index.vue

@@ -409,8 +409,10 @@
 				if(_this.current == 0) {
 					$api.req({
 						url: "sign/prize",
-						page: 1,
-						limit: 5
+						data: {
+							page: 1,
+							limit: 5
+						},
 					}, function(res) {
 						_this.qiandao_list = res.data.list
 					})

pages/shangdian/index.vue

@@ -26,7 +26,7 @@
 		</view>
 		<view class="list hflex acenter fwrap">
 			<view class="list-item" v-for="(item,index) in list" :key="index" @click="toinfo(item)">
-				<image :src="item.img" mode="aspectFill"></image>
+				<image :src="item.image" mode="aspectFill"></image>
 				<view class="name text_hide2">{{item.name}}</view>
 				<view class="bottom hflex acenter jbetween">
 					<view class="price">{{item.price}}<text>积分</text></view>
@@ -47,19 +47,33 @@
 		data() {
 			return {
 				search: '',
-				swiper_list: [
-					'https://dummyimage.com/279x155/e3e3e3/fff',
-					'https://dummyimage.com/289x155/e3e3e3/fff',
-					'https://dummyimage.com/299x155/e3e3e3/fff',
-				],
+				swiper_list: [],
 				swiper_current: 0,
 				list: [],
+				page: 1,
+				last_page: 1,
 			}
 		},
 		onLoad() {
+			this.getswiper()
 			this.getlist()
 		},
 		methods: {
+			
+			getswiper() {
+				var _this = this
+				$api.req({
+					url: 'banner',
+					data: {
+						type: 'integral_shop',
+						limit: 5
+					}
+				}, function(res) {
+					if(res.code == 10000) {
+						_this.swiper_list = res.data
+					}
+				})
+			},
 			/* 设备租赁 */
 			tozulin() {
 				uni.navigateTo({
@@ -87,24 +101,39 @@
 			/* 进入商品详情 */
 			toinfo(item) {
 				uni.navigateTo({
-					url: '/pageB/good-detail?id=1'
+					url: '/pageB/good-detail?id=' + item.id
 				})
 			},
 			/* 获取商品列表 */
 			getlist() {
-				var good = {
-					img: 'https://dummyimage.com/279x155/e3e3e3/fff',
-					name: 'iPhone 15 Pro Max  原色钛金属 支持移动联通电 … ',
-					price: 3275
-				}
-				for(var i=0;i<20;i++) {
-					this.list.push(good)
-				}
+				var _this = this
+				$api.req({
+					url: 'integral/goods',
+					method: 'GET',
+					data: {
+						is_page: 1,
+						page: _this.page,
+						limit: 10
+					}
+				}, function(res) {
+					if(res.code == 10000) {
+						_this.list = _this.list.concat(res.data.list)
+						_this.last_page = res.data.last_page
+					}
+				})
 			},
 			/* 轮播图点击事件 */
 			swiperclick() {},
 			/* 搜索 */
 			tosearch() {},
+		},
+		onReachBottom() {
+			if(this.last_page > this.page) {
+				this.page++;
+				this.getlist()
+			} else {
+				uni.$u.toast('已经到底了')
+			}
 		}
 	}
 </script>
@@ -123,6 +152,7 @@
 				margin: 0 14rpx 16rpx 0;
 				image {
 					width: 100%;
+					height: 340rpx;
 				}
 				.name {
 					font-size: 26rpx;