6.18

common/api/shop.js

@@ -1,9 +1,12 @@
 export default {
     init(vm){
         return {
-            postlogn({id,name}){
+			// 商品推荐
-                return vm.$u.get('url',{id,name});
+            getGoodsRecommend({page}){
-            }
+                return vm.$u.post('Goods/getGoodsRecommend', {
+					page: page
+				});
+			}
         }
     }
     

common/api/user.js

@@ -1,12 +1,6 @@
 export default {
     init(vm){
         return {
-			phoneRegister({member_mobile, sms_code}) {
-				return vm.$u.post('auth/phoneRegister', {
-					member_mobile: member_mobile, 
-					sms_code: sms_code
-				});
-			},
 			// 启动页
 			pageList({document_code}) {
 				return vm.$u.post('StartUp/pageList', {});

components/remaining/remaining.vue

@@ -20,10 +20,11 @@
 		<!-- 用户协议弹窗 -->
 		<view class="welcome_backes" v-if="protocol">
 			<view class="content">
-				<view class="title">用户协议</view>
+				<view class="title">{{ agreement.document_title }}</view>
-				<text class="protocol_content">
+				<!-- <text class="protocol_content"></text> -->
-					亲，感谢您对德铭阳光在线的信任!
					请注意，在您使用本软件过程中我们会按照《德铭阳光在线隐私保护声明》、《权限声明》 收集、使用和共享您的个人信息，请认真阅读并充分理解。特别提示:
					1、为向您提供交易相关基本功能，我们会收集、使用必要的信息; 
					2、基于您的授权，我们可能会获取您的位置等信息，您有权拒绝或取消授权;
					3、我们会采取业界先进的安全措施保护您的信息安全;
					4、未经您同意，我们不会从第三方处获取、共享或向其提供您的信息;
					5、您可以查询、更正、删除您的个人信息，我们也提供账户注销的渠道。
+				<scroll-view scroll-y class="scroll">
-				</text>
+					<rich-text class="protocol_content" :nodes="agreement.document_content"></rich-text>
+				</scroll-view>
 				<view class="to_agree" @click="to_agree">我同意</view>
 			</view>
 		</view>
@@ -43,25 +44,35 @@
 				indicatorDots: true,
 				autoplay: true,
 				interval: 3000,
-				duration: 500
+				duration: 500,
+				agreement: { // 用户协议内容
+					document_title: "",
+					document_content: ""
+				}
 			};
 		},
 		onLoad() {
 			
-				
 		},
 		methods: {
+			unescapeHTML (temp){
+				temp = "" + temp;
+				return temp.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&apos;/g, "'");
+			},
 			apiwelcome(){
 				this.$u.api.documentInfo({
 					document_code:'agreement'
 				}).then((res)=>{
-					console.log('协议',res)
+					if (res.errCode == 0) {
-					
+						let agreement = res.data;
+						agreement.document_content = this.unescapeHTML(agreement.document_content);
+						// console.log(agreement);
+						this.agreement = agreement;
+					}
 				})
 				// 启动页
 				this.$u.api.pageList({}).then((res)=>{
 					console.log('协议',res)
-					
 				})
 			},
 			// 3秒倒计时
@@ -110,7 +121,6 @@
 </script>
 
 <style lang="scss" scoped>
-
 	.welcome_jumpes{
 		width: 90rpx;
 		height: 35rpx;
@@ -133,7 +143,7 @@
 	}
 	uni-swiper,uni-view,uni-image{
 		width: 100%;
-		position: fixed;
+		// position: fixed;
 		height: 100%
 	}
 	uni-image{
@@ -168,18 +178,22 @@
 				line-height:29rpx;
 				margin: 30rpx 0 24rpx 0;
 			}
-			.protocol_content{
+			.scroll {
-				width:494rpx;
+				height: 560rpx;
-				height:528rpx;
+				.protocol_content{
-				font-size:24rpx;
+					width:494rpx;
-				font-weight:400;
+					height:528rpx;
-				color:rgba(51,51,51,1);
+					font-size:24rpx;
-				display: block;
+					font-weight:400;
-				text-align: left;
+					color:rgba(51,51,51,1);
-				margin: 80rpx auto 33rpx;
+					display: block;
-				letter-spacing: 1rpx;
+					text-align: left;
-				text-align: justify;
+					margin: 80rpx auto 33rpx;
-				line-height: 36rpx;
+					letter-spacing: 1rpx;
+					text-align: justify;
+					line-height: 36rpx;
+
+				}
 			}
 			.to_agree{
 				width:558rpx;

components/shop/list/index.vue

@@ -4,16 +4,11 @@
             商品推荐
         </view>
         <view class="label">
-            <text>asd</text>
+			<text>分类名称</text>
-            <text>sda</text>
+            <text v-for="item in classifyList" :key="item.gc_id">{{ item.gc_name }}</text>
-            <text>w3eq</text>
         </view>
         <view class="item">
-            <item></item>
+            <item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
-            <item></item>
-            <item></item>
-            <item></item>
-            <item></item>
         </view>
     </view>    
 </template>
@@ -23,7 +18,11 @@ export default {
     name:"list",
     components:{
         item
-    }
+	},
+	props: {
+		classifyList: Array,
+		goodsList: Array,
+	}
 }
 </script>
 <style lang="scss" scoped>
@@ -38,9 +37,10 @@ export default {
     .label{
         display: flex;
         color: #999;
-
+		flex-wrap: wrap;
         >text{
             margin-right: 34rpx;
+			margin-bottom: 10rpx;
         }
     }
     .item{

components/shop/list/item.vue

@@ -1,16 +1,19 @@
 <template>
     <view class="item">
-        <image class="img"></image>
+        <image :src="$u.http.config.baseUrl + info.goods_image" class="img"></image>
         <view class="info">
-            <text class="title"></text>
+            <text class="title u-line-1">{{ info.goods_name }}</text>
-            <text class="jianjie"></text>
+            <text class="jianjie u-line-2">{{ info.goods_advword }}</text>
-            <text class="price"></text>
+            <text class="price">{{ info.goods_price }}</text>
         </view>
     </view>
 </template>
 <script>
 export default {
-    name:"item"    
+	name:"item",
+	props: {
+		info: Object
+	}
 }
 </script>
 <style lang="scss" scoped>
@@ -28,6 +31,7 @@ export default {
         
     }
     .info{
+		width: 320rpx;
         padding: 0 12rpx;
         display: flex;
         flex-direction: column;

components/shop/shop-item/index.vue

@@ -1,12 +1,15 @@
 <template>
     <view class="shop-item">
         <image></image>
-        <text>名字哦</text>
+        <text>{{ info.gc_name }}</text>
     </view>    
 </template>
 <script>
 export default {
-    name:"shopItem"
+	name:"shopItem",
+	props: {
+		info: Object
+	}
 }
 </script>
 <style lang="scss" scoped>

pageA/login/login.vue

@@ -112,6 +112,11 @@
 						        console.log('success');
 						    }
 						});
+						// 存储接口请求所需token
+						uni.setStorage({
+						    key: 'token',
+						    data: res.data.data.token,
+						});
 						// 注册返回参数
 						this.$refs.uToast.show({
 							title: res.message,
@@ -265,6 +270,7 @@
 		}
 
 		.labales {
+			color: #FFF;
 			border-bottom: 1px #fff solid;
 			margin-bottom: 90rpx;
 			height: 70rpx;

pageA/register/register.vue

@@ -96,11 +96,11 @@
 						    }
 						});
 						// 注册返回参数
-						this.$refs.uToast.show({
+						// this.$refs.uToast.show({
-							title: res.message,
+						// 	title: res.message,
-							type: 'success',
+						// 	type: 'success',
-							url: '/pageA/topick/topick'
+						// 	url: '/pageA/topick/topick'
-						})
+						// })
 					}
 					if(res.errCode == 1){
 						this.$refs.uToast.show({

pageA/topick/topick.vue

@@ -13,7 +13,7 @@
 				<view :class="{'cur': rSelect.indexOf(index)!=-1}" v-for="(item,index) in tab_lables" :key="index" @click="tapClick(index)">{{item}}</view>
 			</view>
 			<!-- 提交按钮 -->
-			<view class="submites">{{submites}}</view>
+			<view class="submites" @click="toHomePage">{{submites}}</view>
 		</view>
 	</view>
 </template>
@@ -54,6 +54,11 @@
 				} else {
 					this.rSelect.splice(this.rSelect.indexOf(index), 1); //取消
 				}
+			},
+			toHomePage() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
 			}
 		}
 	};

pageE/more/WriteComments.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="write-complaints">
 		<view class="main-container">
-			<textarea @blur="bindTextAreaBlur" auto-height placeholder="发表您的意见吧，我们会做得更好." maxlength="200" />
+			<textarea auto-height placeholder="发表您的意见吧，我们会做得更好." maxlength="200" v-model="text" />
 			<u-upload 
 				ref="uUpload" 
 				@on-uploaded="onUploaded" 
@@ -22,6 +22,7 @@ export default {
 	data() {
 		return {
 			count: 4, // 最大图片数量
+			text: '',
 			imageList: []
 		}
 	},
@@ -30,7 +31,7 @@ export default {
 			this.$refs.uUpload.upload();
 		},
 		onUploaded(list) {
-			console.log(list)
+			console.log(this.text, list)
 		}
 	},
 }

pages.json

@@ -621,18 +621,13 @@
 								"buttons": [
 									{
 										"type":"none",
-										"text":"取消",
+										"text":"\ue62d",
-										"float":"left",
-										"fontSize":"14"
-									},
-									{  
-										"type":"none",
-										"text":"\ue264",
 										"float":"right",
-										"fontSize":"14"
+										"fontSrc": "/static/fonts/customer.ttf",
+										"fontSize":"20"
 									}
 								],
-								"autoBackButton": false,
+								"autoBackButton": true,
 								"backButton": {
 									"badgeText": "取消"
 								}
@@ -745,7 +740,7 @@
 			]
 		}	
 	],
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [
 		{
 			"path": "pageA/welcome/welcome",
 			"style": {
@@ -755,18 +750,15 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/shop/index",
 			"style": {
-				"navigationBarTitleText": "商城",
 				"navigationStyle": "custom"
 			}
 		},
-		
 		{
 			"path": "pages/information/information",
 			"style": {
@@ -789,10 +781,12 @@
 						"backgroundColor": "#FFFFFF",
 						"buttons": [
 							{
+								"color": "#717171",
 								"type": "none",
-								"text": "\ue502",
+								"text": "\ue63f",
+								"fontSrc": "/static/fonts/setting.ttf",
 								"float": "right",
-								"fontSize": "14"
+								"fontSize": "18"
 							}
 						]
 					}

pages/index/index.vue

@@ -197,6 +197,13 @@ export default {
             }
         }
     },
-    onLoad(){}
+    onLoad(){
+        // this.$u.api.phoneLogin({
+        //     member_mobile: 1,
+        //     sms_code: 2
+        // }).then((res)=>{
+        //     console.log(res)
+        // })
+    }
 }
 </script>

pages/mine/index.vue

@@ -128,8 +128,8 @@ export default {
     },
 	onLoad() {},
 	onNavigationBarButtonTap() {
-		// console.log("setting");
+		console.log("setting");
-		this.toOtherPage("/pageE/setting/Index");
+		this.toOtherPage("/setting/Index");
 	},
     methods: {
 		toOtherPage(url) {
@@ -143,7 +143,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .mine {
-	min-height: calc(100vh - var(--window-top));
+	min-height: calc(calc(100vh - var(--window-top)) - 50px);
 	background: #ECECEC;
     .mine-top {
 		width: 750rpx;

pages/shop/index.vue

@@ -1,35 +1,35 @@
 <template>
     <view class="shop">
         <view class="top">
-            <image class="local"></image>
+            <image src="/static/image/shop/1.png" class="local"></image>
-            <view class="add">
+            <view class="add" @click="chooseArea=true">
-                <text></text>
+                <text class="u-line-1">{{ area }}</text>
-                <image></image>
+                <image src="/static/image/shop/2.png"></image>
             </view>
             <u-search placeholder="日照香炉生紫烟" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999"></u-search>
-            <image class="mnue"></image>
+            <image src="/static/image/shop/3.png" class="mnue"></image>
         </view>
         <u-swiper :list="list"></u-swiper>
         <view class="chengnuo">
             <view>
-                <image></image>
+                <image src="/static/image/shop/4.png"></image>
                 <text>免费洗衣</text>
             </view>
             <view>
-                <image></image>
+                <image src="/static/image/shop/5.png"></image>
                 <text>全国包邮</text>
             </view>
             <view>
-                <image></image>
+                <image src="/static/image/shop/6.png"></image>
                 <text>延误必赔</text>
             </view>
             <view>
-                <image></image>
+                <image src="/static/image/shop/7.png"></image>
                 <text>上门取件</text>
             </view>
         </view>
         <view class="fenlei">
-            <shopitem v-for="item in 5" class="item"></shopitem>
+            <shopitem v-for="item in classifyList" :key="item.gc_id" class="item" :info="item"></shopitem>
         </view>
         <view class="fenlei">
             <shopitem v-for="item in 5" class="item"></shopitem>
@@ -45,7 +45,8 @@
         <image class="lingquan"></image>
         <youhq></youhq>
         <view class="hr" style="margin-top:40rpx"></view>
-        <list></list>
+        <list :classifyList="classifyList" :goodsList="goodsList"></list>
+		<u-picker mode="region" :params="areaParams" v-model="chooseArea" @confirm="setArea"></u-picker>
     </view>
 </template>
 <script>
@@ -68,28 +69,57 @@ export default {
     },
     data(){
         return {
+			area: "北京市",
+			chooseArea: false,
+			areaParams: {
+				province: true,
+				city: true,
+				area: false
+			},
             keyword:"",
             list:[{
-						image: '/static/uView/swiper/swiper1.jpg',
+					image: '/static/uView/swiper/swiper1.jpg',
-						title: '蒹葭苍苍，白露为霜。所谓伊人，在水一方'
+					title: '蒹葭苍苍，白露为霜。所谓伊人，在水一方'
-					},
+				},
-					{
+				{
-						image: '/static/uView/swiper/swiper2.jpg',
+					image: '/static/uView/swiper/swiper2.jpg',
-						title: '溯洄从之，道阻且长。溯游从之，宛在水中央'
+					title: '溯洄从之，道阻且长。溯游从之，宛在水中央'
-					},
+				},
-					{
+				{
-						image: '/static/uView/swiper/swiper3.jpg',
+					image: '/static/uView/swiper/swiper3.jpg',
-						title: '蒹葭萋萋，白露未晞。所谓伊人，在水之湄'
+					title: '蒹葭萋萋，白露未晞。所谓伊人，在水之湄'
-					}
+				}
-				]
+			],
+			classifyList: [],
+			goodsList: []
         }
-    }
+	},
+	onLoad() {
+		console.log(this.$u.http)
+		this.getGoodsRecommend();
+	},
+	methods: {
+		getGoodsRecommend() {
+			this.$u.api.getGoodsRecommend({
+				page: 1,
+			}).then((res)=>{
+				console.log(res);
+				if (res.errCode == 0) {
+					this.classifyList = res.data.classifyList;
+					this.goodsList = res.data.goodsList;
+					// console.log(this.classifyList);
+					
+				}
+			})
+		},
+		setArea(e) {
+			// console.log(e);
+			this.area = e.city.label;
+		}
+	},
 }
 </script>
 <style lang="scss" scoped>
-/deep/image{
-    background-color: #0f0;
-}
 .shop{
     padding: 0 33rpx;
     .top{
@@ -112,6 +142,9 @@ export default {
         align-items: center;
         margin-left: 14rpx;
         margin-right: 37rpx;
+		> text {
+			width: 80rpx;
+		}
         >image{
             width: 24rpx;
             height: 15rpx;