diff --git a/App.vue b/App.vue
index 860b69e..bf7b9e5 100644
--- a/App.vue
+++ b/App.vue
@@ -1,15 +1,5 @@
 <script>
-	export default {
-		onLaunch: function() {
-			console.log('App Launch')
-		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
-	}
+	export default {}
 </script>
 <style lang="scss">
 @import "/static/css/normalize"
diff --git a/common/api/shop.js b/common/api/shop.js
new file mode 100644
index 0000000..bc51f99
--- /dev/null
+++ b/common/api/shop.js
@@ -0,0 +1,10 @@
+export default {
+    init(vm){
+        return {
+            postlogn({id,name}){
+                return vm.$u.get('url',{id,name});
+            }
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/common/api/user.js b/common/api/user.js
new file mode 100644
index 0000000..174c82c
--- /dev/null
+++ b/common/api/user.js
@@ -0,0 +1,24 @@
+export default {
+    init(vm){
+        return {
+			phoneRegister({member_mobile, sms_code}) {
+				return vm.$u.post('auth/phoneRegister', {
+					member_mobile: member_mobile, 
+					sms_code: sms_code
+				});
+			},
+			phoneLogin({member_mobile, sms_code}) {
+				return vm.$u.post('auth/phoneLogin', {
+					member_mobile: member_mobile, 
+					sms_code: sms_code
+				});
+			},
+			sendSmsCode({member_mobile, sms_type}) {
+				return vm.$u.get('sms/sendSmsCode', {
+					member_mobile: member_mobile, 
+					sms_type: sms_type
+				});
+			}
+        }
+    }
+}
\ No newline at end of file
diff --git a/common/http.api.js b/common/http.api.js
new file mode 100644
index 0000000..f1b595f
--- /dev/null
+++ b/common/http.api.js
@@ -0,0 +1,16 @@
+
+// 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作，更多内容详见uView对拦截器的介绍部分：
+// https://uviewui.com/js/http.html#%E4%BD%95%E8%B0%93%E8%AF%B7%E6%B1%82%E6%8B%A6%E6%88%AA%EF%BC%9F
+import shop from "./api/shop"
+import user from "./api/user"
+
+const install = (Vue, vm) => {
+    let userApi = user.init(vm) 
+    let shopApi = shop.init(vm) 
+	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
+	vm.$u.api = {...userApi,...shopApi};
+}
+
+export default {
+	install
+}
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
new file mode 100644
index 0000000..0d9d5f9
--- /dev/null
+++ b/common/http.interceptor.js
@@ -0,0 +1,62 @@
+const install = (Vue, vm) => {
+	// 此为自定义配置参数，具体参数见上方说明
+	Vue.prototype.$u.http.setConfig({
+		baseUrl: 'https://dmmall.sdbairui.com/api',
+		loadingText: '努力加载中~',
+		loadingTime: 800
+		// ......
+	});
+	
+	// 请求拦截，配置Token等参数
+	Vue.prototype.$u.http.interceptor.request = (config) => {
+		// 引用token
+		// 方式一，存放在vuex的token，假设使用了uView封装的vuex方式
+		// 见：https://uviewui.com/components/globalVariable.html
+		// config.header.token = vm.token;
+		
+		// 方式二，如果没有使用uView封装的vuex方法，那么需要使用$store.state获取
+		// config.header.token = vm.$store.state.token;
+		
+		// 方式三，如果token放在了globalData，通过getApp().globalData获取
+		// config.header.token = getApp().globalData.username;
+		
+		// 方式四，如果token放在了Storage本地存储中，拦截是每次请求都执行的
+		// 所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值
+		const token = uni.getStorageSync('token');
+		config.header.token = token;
+		// config.header.Token = 'xxxxxx';
+		
+		// 可以对某个url进行特别处理，此url参数为this.$u.get(url)中的url值 
+		// if(config.url == '/user/login') config.header.noToken = true;
+		// 最后需要将config进行return
+		return config;
+		// 如果return一个false值，则会取消本次请求
+		// if(config.url == '/user/rest') return false; // 取消某次请求
+	}
+	
+	// // 响应拦截，判断状态码是否通过
+	// Vue.prototype.$u.http.interceptor.response = (res) => {
+	// 	if(res.code == 200) {
+	// 		// res为服务端返回值，可能有code，result等字段
+	// 		// 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到
+	// 		// 如果配置了originalData为true，请留意这里的返回值
+	// 		return res.result;
+	// 	} else if(res.code == 201) {
+	// 		// 假设201为token失效，这里跳转登录
+	// 		vm.$u.toast('验证失败，请重新登录');
+	// 		setTimeout(() => {
+	// 			// 此为uView的方法，详见路由相关文档
+	// 			vm.$u.route('/pages/user/login')
+	// 		}, 1500)
+	// 		return false;
+	// 	} else {
+	// 		// 如果返回false，则会调用Promise的reject回调，
+	// 		// 并将进入this.$u.post(url).then().catch(res=>{})的catch回调中，res为服务端的返回值
+	// 		return false;
+	// 	}
+	// }
+}
+
+export default {
+	install
+}
diff --git a/components/shop/group/index.vue b/components/shop/group/index.vue
new file mode 100644
index 0000000..bae48f7
--- /dev/null
+++ b/components/shop/group/index.vue
@@ -0,0 +1,66 @@
+<template>
+    <view class="group">
+        <view class="top">
+            <text>全部拼团</text>
+            <text>查看更多></text>
+        </view>
+        <view class="label">
+            <text>sda</text>
+            <text>asda</text>
+            <text>dsad</text>
+            <text>asdas</text>
+        </view>
+        <view class="list">
+            <sitem></sitem>
+            <sitem></sitem>
+            <sitem></sitem>
+        </view>
+    </view>
+</template>
+<script>
+import sitem from "./item"
+export default {
+    name:"group",
+    components:{
+        sitem
+    },
+    data(){
+        return {
+
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.group{
+    .top{
+        height: 90rpx;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        >text:first-child{
+            font-size: 30rpx;
+            color: #333;
+        }
+        >text:last-child{
+            font-size: 18rpx;
+            color: #999;
+        }
+    }
+    .label{
+        display: flex; 
+        font-size: 24rpx;
+        color: #999;
+        >text{
+            margin-right: 34rpx;
+        }
+    }
+    .list{
+        display: flex;
+        justify-content: space-between;
+        margin-top: 21rpx;
+        
+    }
+}
+</style>
\ No newline at end of file
diff --git a/components/shop/group/item.vue b/components/shop/group/item.vue
new file mode 100644
index 0000000..cac3f6e
--- /dev/null
+++ b/components/shop/group/item.vue
@@ -0,0 +1,47 @@
+<template>
+    <view class="item">
+        <image class="head"></image>
+        <text class="title">商品名</text>
+        <view class="price">
+            <text>￥99</text>
+           <text>立即购买</text>
+
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    name:"item"
+}
+</script>
+<style lang="scss" scoped>
+.item{
+    width: 210rpx;
+    .head{
+        width: 210rpx;
+        height: 131rpx;
+        border-radius: 6rpx;
+
+    }
+    .title{
+        font-size: 26rpx;
+        color: #333;
+        margin-top: 16rpx;
+    }
+    .price{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-top: 19rpx;
+        >text:first-child{
+            font-size: 26rpx;
+            color: #FF3131;
+        }
+         >text:last-child{
+            color: #FDD360;
+        }
+
+    }
+    
+}
+</style>
\ No newline at end of file
diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue
new file mode 100644
index 0000000..4a02a41
--- /dev/null
+++ b/components/shop/list/index.vue
@@ -0,0 +1,54 @@
+<template>
+    <view class="list">
+        <view class="top">
+            商品推荐
+        </view>
+        <view class="label">
+            <text>asd</text>
+            <text>sda</text>
+            <text>w3eq</text>
+        </view>
+        <view class="item">
+            <item></item>
+            <item></item>
+            <item></item>
+            <item></item>
+            <item></item>
+        </view>
+    </view>    
+</template>
+<script>
+import item from "./item"
+export default {
+    name:"list",
+    components:{
+        item
+    }
+}
+</script>
+<style lang="scss" scoped>
+.list{
+    .top{
+        font-size: 30rpx;
+        height: 90rpx;
+        line-height: 90rpx;
+        text-align: center;
+        color: #333;
+    }
+    .label{
+        display: flex;
+        color: #999;
+
+        >text{
+            margin-right: 34rpx;
+        }
+    }
+    .item{
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-top: 20rpx;
+
+    }
+}
+</style>
\ No newline at end of file
diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue
new file mode 100644
index 0000000..23be604
--- /dev/null
+++ b/components/shop/list/item.vue
@@ -0,0 +1,49 @@
+<template>
+    <view class="item">
+        <image class="img"></image>
+        <view class="info">
+            <text class="title"></text>
+            <text class="jianjie"></text>
+            <text class="price"></text>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    name:"item"    
+}
+</script>
+<style lang="scss" scoped>
+.item{
+    
+    width: 330rpx;
+    height: 469rpx;
+    margin-bottom: 27rpx;
+    background-color: #f8f8f8;
+    border-radius: 10rpx;
+    overflow: hidden;
+    .img{
+        width: 100%;
+        height: 272rpx;
+        
+    }
+    .info{
+        padding: 0 12rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
+        .title{
+            font-size: 30rpx;
+            color: #333;
+        }
+        .jianjie{
+            font-size: 26rpx;
+            color: #666;
+        }
+        .price{
+            color: #FF3131;
+            font-size: 26rpx;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/components/shop/recommend/index.vue b/components/shop/recommend/index.vue
new file mode 100644
index 0000000..4c38bbb
--- /dev/null
+++ b/components/shop/recommend/index.vue
@@ -0,0 +1,101 @@
+<template>
+    <view class="recommend">
+        <view class="top">
+            <text>今日秒杀推荐</text>
+            <text>点击查看更多></text>
+        </view>
+        <view class="connect">
+            <view class="time">
+                <image></image>
+                <text>12:00</text>
+            </view>
+            <view class="info">
+                <text>修身套头上衣</text>
+                <text class="u-line-2">珂莱蒂尔雪纺衫2020春装新简约百搭V领蕾丝九分... </text>
+                <view>
+                    <text>￥99</text>
+                    <text>￥299</text>
+                </view>
+            </view>
+            <image class="img"></image>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    name:"recommend"
+}
+</script>
+<style lang="scss" scoped>
+.recommend{
+    .top{
+        height: 90rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        >text:first-child{
+            font-size: 30rpx;
+            color: #333;
+        }
+        >text:last-child{
+            font-size: 18rpx;
+            color: #999;
+        }
+    }
+    .connect{
+        display: flex;
+        .time{
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            margin-right: 18rpx;
+            justify-content: center;
+            >image{
+                width: 90rpx;
+                height: 90rpx;
+            }
+            >text{
+                font-size: 36rpx;
+                margin-top: 25rpx;
+                color: #FDD360;
+            }
+            flex-shrink: 0;
+        }
+        .info{
+            display: flex;
+            flex-direction: column;
+            >text:nth-child(1){
+                font-size: 28rpx;
+                color: #333;
+            }
+            >text:nth-child(2){
+                margin-top: 17rpx;
+                line-height: 36rpx;
+                font-size: 24rpx;
+                color: #666;
+            }
+            >view{
+                margin-top: 24rpx;
+                display: flex;
+                align-items: flex-end;
+                
+                >text:first-child{
+                    font-size: 27rpx;
+                    color: #FF3131;
+                }
+                >text:last-child{
+                    font-size: 24rpx;
+                    color: #999;
+                    margin-left: 33rpx;
+                }
+            }
+        }
+        .img{
+            width: 213rpx;
+            height: 160rpx;
+            flex-shrink: 0;
+            margin-left: 13rpx;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/components/shop/seckill/index.vue b/components/shop/seckill/index.vue
new file mode 100644
index 0000000..fdf87ac
--- /dev/null
+++ b/components/shop/seckill/index.vue
@@ -0,0 +1,71 @@
+<template>
+    <view class="seckill">
+        <view class="top">
+            <view class="title">
+                <view class="name">全部秒杀</view>
+                <view class="time">
+                    <text class="num">12</text>
+                    <text class="mah">:</text>
+                    <text class="num">12</text>
+                    <text class="mah">:</text>
+                    <text class="num">12</text>
+                </view>
+            </view>
+            <view class="next">
+                查看更多>
+            </view>
+        </view>
+        <view class="list">
+            <sitem></sitem>
+            <sitem></sitem>
+            <sitem></sitem>
+        </view>
+    </view>
+</template>
+<script>
+import sitem from "./item"
+export default {
+    name:"seckill",
+    components:{
+        sitem
+    }
+}
+</script>
+<style lang="scss" scoped>
+.seckill{
+    .top{
+        height: 60rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .title{
+            display: flex;
+            align-items: center;
+            .name{
+                font-size: 30rpx;
+                color: #333;
+            }
+            .time{
+                margin-left: 39rpx;
+                display: flex;
+                align-items: center;
+                font-size: 20rpx;
+                .num{
+                    width: 25rpx;
+                    height: 25rpx;
+                    background-color: #bfbfbf;
+                    margin: 0 10rpx;
+                }
+            }
+        }
+        .next{
+            font-size: 18rpx;
+            color: #999;
+        }
+    }
+    .list{
+        display: flex;
+        justify-content: space-between;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/components/shop/seckill/item.vue b/components/shop/seckill/item.vue
new file mode 100644
index 0000000..f5af869
--- /dev/null
+++ b/components/shop/seckill/item.vue
@@ -0,0 +1,63 @@
+<template>
+    <view class="item">
+        <image class="head"></image>
+        <text class="title">商品名</text>
+        <view class="price">
+            <text>￥99</text>
+            <text>￥299</text>
+        </view>
+        <view class="info">
+            <text>剩余21件</text>
+            <text>立即购买</text>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    name:"item"
+}
+</script>
+<style lang="scss" scoped>
+.item{
+    width: 210rpx;
+    .head{
+        width: 210rpx;
+        height: 131rpx;
+        border-radius: 6rpx;
+
+    }
+    .title{
+        font-size: 26rpx;
+        color: #333;
+        margin-top: 16rpx;
+    }
+    .price{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-top: 19rpx;
+        >text:first-child{
+            font-size: 26rpx;
+            color: #FF3131;
+        }
+        >text:last-child{
+            font-size: 24rpx;
+            color: #999;
+        }
+
+    }
+    .info{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 22rpx;
+        margin-top: 19rpx;
+        >text:first-child{
+            color: #666;
+        }
+        >text:last-child{
+            color: #FDD360;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/components/shop/shop-item/index.vue b/components/shop/shop-item/index.vue
new file mode 100644
index 0000000..899b3b8
--- /dev/null
+++ b/components/shop/shop-item/index.vue
@@ -0,0 +1,29 @@
+<template>
+    <view class="shop-item">
+        <image></image>
+        <text>名字哦</text>
+    </view>    
+</template>
+<script>
+export default {
+    name:"shopItem"
+}
+</script>
+<style lang="scss" scoped>
+.shop-item{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    >image{
+        width: 80rpx;
+        height: 80rpx;
+        border-radius: 50%;
+
+    }
+    >text{
+        font-size: 24rpx;
+        color: #333;
+        margin-top: 14rpx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/components/shop/youhq/index.vue b/components/shop/youhq/index.vue
new file mode 100644
index 0000000..ac25922
--- /dev/null
+++ b/components/shop/youhq/index.vue
@@ -0,0 +1,72 @@
+<template>
+    <view class="youhq">
+        <view class="top">
+            <text>全部优惠券</text>
+            <text>查看更多></text>
+        </view>
+        <view class="label">
+            <text>sda</text>
+            <text>asda</text>
+            <text>dsad</text>
+            <text>asdas</text>
+        </view>
+        <scroll-view style="width:100%;margin-top: 21rpx;" scroll-x="true">
+            <view class="list">
+                <sitem></sitem>
+                <sitem></sitem>
+                <sitem></sitem>
+                <sitem></sitem>
+                <sitem></sitem>
+            </view>
+        </scroll-view>
+
+       
+    </view>
+</template>
+<script>
+import sitem from "./item"
+export default {
+    name:"youhq",
+    components:{
+        sitem
+    },
+    data(){
+        return {
+
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.youhq{
+    .top{
+        height: 90rpx;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        >text:first-child{
+            font-size: 30rpx;
+            color: #333;
+        }
+        >text:last-child{
+            font-size: 18rpx;
+            color: #999;
+        }
+    }
+    .label{
+        display: flex; 
+        font-size: 24rpx;
+        color: #999;
+        >text{
+            margin-right: 34rpx;
+        }
+    }
+    .list{
+        display: flex;
+        // justify-content: space-between;
+        width: auto;
+        
+    }
+}
+</style>
\ No newline at end of file
diff --git a/components/shop/youhq/item.vue b/components/shop/youhq/item.vue
new file mode 100644
index 0000000..f9a6923
--- /dev/null
+++ b/components/shop/youhq/item.vue
@@ -0,0 +1,83 @@
+<template>
+    <view class="item">
+        <view class="top">
+            <view class="pic">
+                <text>￥</text>
+                <text>12</text>
+            </view>
+            <view class="man">
+                <text></text>
+                <text></text>
+            </view>
+            <text class="button">
+                立即<br />领取
+            </text>
+        </view>
+        <view class="time">
+            使用时间：2020.01.24-2020.05.08
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    name:"item"
+}
+</script>
+<style lang="scss" scoped>
+.item{
+    padding: 10rpx;
+
+    width: 254rpx;
+    height: 94rpx;
+    border: 2rpx solid #FDD360;
+    border-radius: 20rpx;
+    flex-shrink: 0;
+    margin-right: 16rpx;
+    .top{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .pic{
+            display: flex;
+            align-items: flex-end;
+            color:#FDD360;
+            >text:first-child{
+                font-size: 24rpx;
+            }
+            >text:last-child{
+                font-size: 48rpx;
+            }
+        }
+        .man{
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            color: #FDD360;
+            >text:first-child{
+                font-size: 14rpx;
+                
+            }
+            >text:last-child{
+                font-size: 18rpx;
+                font-weight: bold;
+            }
+        }
+        .button{
+             width: 61rpx;
+             height: 61rpx;
+             border-radius: 50%;
+             font-size: 18rpx;
+             background-color: #FDD360;
+             color: #fff;
+             display: flex;
+             align-items: center;
+             justify-content: center;
+        }
+    }
+    .time{
+        font-size: 12rpx;
+        color: #FDD360;
+        font-weight: bold;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/main.js b/main.js
index dc6b511..bce4f0b 100644
--- a/main.js
+++ b/main.js
@@ -8,4 +8,11 @@ App.mpType = 'app'
 const app = new Vue({
     ...App
 })
+// http拦截器，将此部分放在new Vue()和app.$mount()之间，才能App.vue中正常使用
+import httpInterceptor from '@/common/http.interceptor.js'
+Vue.use(httpInterceptor, app)
+
+// http接口API集中管理引入部分
+import httpApi from '@/common/http.api.js'
+Vue.use(httpApi, app)
 app.$mount()
diff --git a/pageB/components/sdetails/navs.vue b/pageB/components/sdetails/navs.vue
new file mode 100644
index 0000000..6d942bc
--- /dev/null
+++ b/pageB/components/sdetails/navs.vue
@@ -0,0 +1,30 @@
+<template>
+    <view class="nav">
+        <text>dsadasdas</text>
+        <image></image>
+    </view>
+</template>
+<script>
+export default {
+    name:"navs"    
+}
+</script>
+<style lang="scss" scoped>
+.nav{
+    width: 100%;
+    height: 100rpx;
+    display: flex;
+    padding: 30rpx;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 30rpx;
+    // margin-bottom: 2rpx;
+    border-bottom: 2rpx solid #ececec;
+    color:#333;
+    background-color: #fff;
+    >image{
+        width: 13rpx;
+        height: 25rpx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pageB/components/sdetails/tloos.vue b/pageB/components/sdetails/tloos.vue
new file mode 100644
index 0000000..05ff9aa
--- /dev/null
+++ b/pageB/components/sdetails/tloos.vue
@@ -0,0 +1,55 @@
+<template>
+    <view class="tloos">
+        <view class="navs">
+            <image></image>
+            123
+        </view>
+        <view class="navs" style="margin-right:30rpx">
+            <image></image>
+            123
+        </view>
+        <view class="button" style="background:rgba(253,211,96,0.6);">试穿试送</view>
+        <view class="button" style="background:rgba(253,211,96,1);">加入购物车</view>
+        <view class="button" style="background:rgba(255,120,15,1);">立即购买</view>
+    </view>
+</template>
+<script>
+export default {
+    name:"tloos"
+}
+</script>
+<style lang="scss" scoped>
+.tloos{
+    display: flex;
+    position: fixed;
+    height: 98rpx;
+    width: 100%;
+    bottom:0;
+    border-top: 1rpx solid #ececec;
+    .navs{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        font-size: 24rpx;
+        color: #666;
+        flex-shrink: 0;
+        margin-left: 30rpx;
+        >image{
+            width: 35rpx;
+            height: 35rpx;
+            margin-bottom: 15rpx;
+        }
+        
+
+    }
+    .button{
+        width: 100%;
+        height: 100%;
+        line-height: 98rpx;
+        text-align: center;
+        color: #fff;
+
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pageB/components/sdetails/youhuiitem.vue b/pageB/components/sdetails/youhuiitem.vue
new file mode 100644
index 0000000..9d12710
--- /dev/null
+++ b/pageB/components/sdetails/youhuiitem.vue
@@ -0,0 +1,53 @@
+<template>
+    <view class="youhuiitem">
+        <view class="left">
+            <view>
+                <text>￥41</text>
+                <text>店铺优惠券</text>
+            </view>
+            <text>新用户可用</text>
+            <text>有效期2018.09.06-2018.10.06</text>
+        </view>
+        <view class="right">立即领取</view>
+
+    </view>
+</template>
+<script>
+export default {
+    name:"youhuiitem"
+}
+</script>
+<style lang="scss" scoped>
+.youhuiitem{
+    width: 689rpx;
+    height: 173rpx;
+    padding: 0 60rpx 0 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .left{
+        display: flex;
+        flex-direction: column;
+        >text{
+            margin-top: 17rpx;
+            font-size: 24rpx;
+            color: #fff;
+        }
+        >view{
+            display: flex;
+            align-items: flex-end;
+            color: #fff;
+            >text:first-child{
+                font-size: 50rpx;
+            }
+            >text:last-child{
+                font-size: 28rpx;
+            }
+        }
+    }
+    .right{
+        font-size: 32rpx;
+        color: #fff;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pageB/components/sdetails/youhuiquan.vue b/pageB/components/sdetails/youhuiquan.vue
new file mode 100644
index 0000000..44ffe75
--- /dev/null
+++ b/pageB/components/sdetails/youhuiquan.vue
@@ -0,0 +1,27 @@
+<template>
+    <view class="youhuiquan">
+        <view class="top">
+            优惠券详情
+        </view>
+        <view class="title">
+            领取优惠券
+        </view>
+        <scroll-view class="gundong" :scroll-y="true">
+            
+        </scroll-view>
+    </view>
+</template>
+<script>
+export default {
+    name:"youhuiquan"
+}
+</script>
+<style lang="scss" scoped>
+.youhuiquan{
+.gundong{
+    width: 100%;
+    height: 447rpx;
+
+}
+}
+</style>
\ No newline at end of file
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
new file mode 100644
index 0000000..904587f
--- /dev/null
+++ b/pageB/sdetails/index.vue
@@ -0,0 +1,113 @@
+<template>
+    <view class="sdetails">
+        <u-swiper :list="list" height="500" border-radius="0"></u-swiper>
+        <view class="info">
+            <view class="title">
+                <text>萨的环境</text>
+
+                                               套装新款小个子春季时尚韩版短袖衬衫套装
+新款小个子春季时尚韩版...
+                            
+            </view>
+            <view class="pic">
+                <text>￥24</text>
+                <s>￥12</s>
+            </view>
+        </view>
+        <view class="hr"></view>
+        <navs></navs>
+        <navs></navs>
+        <navs></navs>
+        <view class="xiangqing">
+            <view class="heng"></view>
+            <view class="title">商品详情</view>
+            <view class="heng"></view>
+        </view>
+        <tloos></tloos>
+    </view>
+</template>
+<script>
+import navs from "../components/sdetails/navs"
+import tloos from "../components/sdetails/tloos"
+export default {
+    name:"sdetails",
+    components:{
+        navs,
+        tloos
+    },
+    data() {
+        return {
+            list: [{
+                    image: '/static/uView/swiper/swiper1.jpg',
+                    title: '蒹葭苍苍，白露为霜。所谓伊人，在水一方'
+                },
+                {
+                    image: '/static/uView/swiper/swiper2.jpg',
+                    title: '溯洄从之，道阻且长。溯游从之，宛在水中央'
+                },
+                {
+                    image: '/static/uView/swiper/swiper3.jpg',
+                    title: '蒹葭萋萋，白露未晞。所谓伊人，在水之湄'
+                }
+            ]
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.sdetails{
+    /deep/image{
+        background-color: #0f0;
+    }
+    .info{
+        padding: 30rpx;
+        .title{
+            flex-wrap: wrap;
+            >text{
+                padding: 13rpx;
+                font-size: 24rpx;
+                color:#fff;
+                margin-right: 13rpx;
+                background-color: #FF780F;
+                display: inline-block;
+                border-radius: 25rpx;
+            }
+        }
+        .pic{
+            >text{
+                font-size: 32rpx;
+                color: #FF3131;
+            }
+            >s{
+                font-size: 26rpx;
+                color: #999;
+                display: inline-block;
+                margin-left: 30rpx;
+            }
+        }
+    }
+    .hr{
+        width: 100%;
+        height: 20rpx;
+        background-color: #ececec;
+    }
+    .xiangqing{
+        display: flex;
+        height: 85rpx;
+        background-color: #ececec;
+        align-items: center;
+        justify-content: center;
+        .heng{
+            width: 79rpx;
+            height: 2rpx;
+            background-color: #a9a9a9;
+
+        }
+        font-size: 28rpx;
+        color: #999;
+        .title{
+            margin: 0 20rpx;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue
index fe74eb6..9ab2f45 100644
--- a/pageE/mine/MemberServe.vue
+++ b/pageE/mine/MemberServe.vue
@@ -173,7 +173,7 @@ export default {
 				.coupon-btn {
 					margin-left: auto;
 					width: 85rpx;
-					height: 42rpx;
+					// height: 42rpx;
 					border: 2rpx solid rgba(255,120,15,1);
 					border-radius: 10rpx;
 					font-size: 26rpx;
diff --git a/pages.json b/pages.json
index 8c00b2a..d858be7 100644
--- a/pages.json
+++ b/pages.json
@@ -83,6 +83,17 @@
 						}
 					}
 				},
+				{
+					"path": "sdetails/index",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"app-plus":{
+							"titleNView":{
+								"backgroundColor":"#ffffff"
+							}
+						}
+					}
+				},
 				{
 					"path": "search/index",
 					"style": {
@@ -305,27 +316,6 @@
 		{
 			"root": "pageE",
 			"pages":[
-				{
-					"path": "mine/MineIndex",
-					"style": {
-						"navigationBarTitleText": "我的",
-						"app-plus": {
-							"titleSize": "36px",
-							"titleNView": {
-								"titleColor": "#333333",
-								"backgroundColor": "#FFFFFF",
-								"buttons": [
-									{  
-										"type": "none",
-										"text": "\ue502",
-										"float": "right",
-										"fontSize": "14"
-									}
-								]
-							}
-						}
-					}
-				},
 				{
 					"path": "tool/MineHistory",
 					"style": {
@@ -759,46 +749,77 @@
 		}	
 	],
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pageA/welcome/welcome",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/shop/index",
+			"style": {
+				"navigationBarTitleText": "商城",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/mine/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus": {
+					"titleSize": "36px",
+					"titleNView": {
+						"titleColor": "#333333",
+						"backgroundColor": "#FFFFFF",
+						"buttons": [
+							{  
+								"type": "none",
+								"text": "\ue502",
+								"float": "right",
+								"fontSize": "14"
+							}
+						]
+					}
+				}
+			}
 		}
 	],
 	"tabBar": {
 		"color": "#999999",
-		"selectedColor": "#FF780F",
+		"selectedColor": "#FFC023",
+		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
-		"fontSize": "12",
-		"iconWidth": "20",
-		"spacing": "7",
 		"list": [{
 			"pagePath": "pages/index/index",
-			"iconPath": "static/image/home.png",
-			"selectedIconPath": "static/image/home2.png",
+			"iconPath": "static/image/tabbar/home.png",
+			"selectedIconPath": "static/image/tabbar/home2.png",
 			"text": "首页"
 		}, {
-			"pagePath": "pages/API/index",
-			"iconPath": "static/image/mall.png",
-			"selectedIconPath": "static/image/mall2.png",
+			"pagePath": "pages/shop/index",
+			"iconPath": "static/image/tabbar/mall.png",
+			"selectedIconPath": "static/image/tabbar/mall2.png",
 			"text": "商城"
 		}, {
-			"pagePath": "pageD/information/information",
-			"iconPath": "static/image/message.png",
-			"selectedIconPath": "static/image/message2.png",
+			"pagePath": "pages/API/index",
+			"iconPath": "static/image/tabbar/message.png",
+			"selectedIconPath": "static/image/tabbar/message2.png",
 			"text": "消息"
 		}, {
-			"pagePath": "pageE/mine/MineIndex",
-			"iconPath": "static/image/mine.png",
-			"selectedIconPath": "static/image/mine2.png",
+			"pagePath": "pages/mine/index",
+			"iconPath": "static/image/tabbar/mine.png",
+			"selectedIconPath": "static/image/tabbar/mine2.png",
 			"text": "我的"
 		}]
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 764365a..1693e69 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -196,6 +196,7 @@ export default {
                 this.num = a
             }
         }
-    }
+    },
+    onLoad(){}
 }
 </script>
\ No newline at end of file
diff --git a/pageE/mine/MineIndex.vue b/pages/mine/index.vue
similarity index 88%
rename from pageE/mine/MineIndex.vue
rename to pages/mine/index.vue
index bd6e3d1..1b1457e 100644
--- a/pageE/mine/MineIndex.vue
+++ b/pages/mine/index.vue
@@ -2,12 +2,12 @@
     <view class="mine">
         <view class="mine-top">
             <view class="top">
-				<img src="../static/mine/23.png" class="avatar" @click="toOtherPage('/mine/MineInfo')" />
+				<image src="/static/image/mine/23.png" class="avatar" @click="toOtherPage('/mine/MineInfo')" />
 				<view class="user-info">
 					<view class="info-left">
 						<view class="user-nickname" @click="toOtherPage('/mine/MineInfo')">小同学</view>
 						<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
-							<img src="../static/mine/13.png" />
+							<img src="/static/image/mine/13.png" />
 							<view class="rank-title">勋章</view>
 						</view>
 					</view>
@@ -47,32 +47,32 @@
 					<view class="title-text">我的订单</view>
 					<view class="more" @click="toOtherPage('/order/Index')">
 						<view>查看全部订单</view>
-						<img src="../static/mine/21.png" />
+						<img src="/static/image/mine/21.png" />
 					</view>
 				</view>
 				<view class="content">
 					<view @click="toOtherPage('/order/Index?current=1')">
-						<img src="../static/mine/6.png" />
+						<img src="/static/image/mine/6.png" />
 						<view>待支付</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=2')">
-						<img src="../static/mine/14.png" />
+						<img src="/static/image/mine/14.png" />
 						<view>已取消</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=3')">
-						<img src="../static/mine/2.png" />
+						<img src="/static/image/mine/2.png" />
 						<view>待收货</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=4')">
-						<img src="../static/mine/1.png" />
+						<img src="/static/image/mine/1.png" />
 						<view>试穿试送</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=5')">
-						<img src="../static/mine/3.png" />
+						<img src="/static/image/mine/3.png" />
 						<view>待评价</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=6')">
-						<img src="../static/mine/9.png" />
+						<img src="/static/image/mine/9.png" />
 						<view>售后</view>
 					</view>
 				</view>
@@ -81,15 +81,15 @@
 				<view class="title">我的工具</view>
 				<view class="content">
 					<view @click="toOtherPage('/tool/SendWash')">
-						<img src="../static/mine/20.png" />
+						<img src="/static/image/mine/20.png" />
 						<view>送洗</view>
 					</view>
 					<view @click="toOtherPage('/tool/Manicure')">
-						<img src="../static/mine/19.png" />
+						<img src="/static/image/mine/19.png" />
 						<view>美甲</view>
 					</view>
 					<view @click="toOtherPage('/tool/MineHistory')">
-						<img src="../static/mine/18.png" />
+						<img src="/static/image/mine/18.png" />
 						<view>足迹</view>
 					</view>
 				</view>
@@ -98,19 +98,19 @@
 				<view class="title">更多工具</view>
 				<view class="content">
 					<view @click="toOtherPage('/more/Address')">
-						<img src="../static/mine/17.png" />
+						<img src="/static/image/mine/17.png" />
 						<view>收货地址</view>
 					</view>
 					<view @click="toOtherPage('/more/AfterSalesHelp')">
-						<img src="../static/mine/9.png" />
+						<img src="/static/image/mine/9.png" />
 						<view>售后政策</view>
 					</view>
 					<view @click="toOtherPage('/more/MineHelp')">
-						<img src="../static/mine/16.png" />
+						<img src="/static/image/mine/16.png" />
 						<view>使用帮助</view>
 					</view>
 					<view @click="toOtherPage('/more/Complaints')">
-						<img src="../static/mine/15.png" />
+						<img src="/static/image/mine/15.png" />
 						<view>投诉意见</view>
 					</view>
 				</view>
@@ -128,12 +128,12 @@ export default {
     },
 	onLoad() {},
 	onNavigationBarButtonTap() {
-		console.log("setting");
-		this.toOtherPage("/setting/Index");
+		// console.log("setting");
+		this.toOtherPage("/pageE/setting/Index");
 	},
     methods: {
 		toOtherPage(url) {
-			console.log(url);
+			// console.log(url);
 			uni.navigateTo({
 				url: '/pageE' + url
 			});
@@ -160,6 +160,7 @@ export default {
 				border-radius: 50%;
 				border: 2rpx solid rgba(251,251,251,1);
 				margin-right: 30rpx;
+				flex-shrink: 0;
 			}
 			.user-info {
 				display: flex;
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
new file mode 100644
index 0000000..e348895
--- /dev/null
+++ b/pages/shop/index.vue
@@ -0,0 +1,163 @@
+<template>
+    <view class="shop">
+        <view class="top">
+            <image class="local"></image>
+            <view class="add">
+                <text></text>
+                <image></image>
+            </view>
+            <u-search placeholder="日照香炉生紫烟" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999"></u-search>
+            <image class="mnue"></image>
+        </view>
+        <u-swiper :list="list"></u-swiper>
+        <view class="chengnuo">
+            <view>
+                <image></image>
+                <text>免费洗衣</text>
+            </view>
+            <view>
+                <image></image>
+                <text>全国包邮</text>
+            </view>
+            <view>
+                <image></image>
+                <text>延误必赔</text>
+            </view>
+            <view>
+                <image></image>
+                <text>上门取件</text>
+            </view>
+        </view>
+        <view class="fenlei">
+            <shopitem v-for="item in 5" class="item"></shopitem>
+        </view>
+        <view class="fenlei">
+            <shopitem v-for="item in 5" class="item"></shopitem>
+        </view>
+        <view class="hr" style="margin-top:80rpx"></view>
+        <recommend></recommend>
+        <view class="hr" style="margin-top:40rpx"></view>
+        <seckill></seckill>
+        <view class="hr" style="margin-top:40rpx"></view>
+        <recommend></recommend>
+        <view class="hr" style="margin-top:40rpx"></view>
+        <group></group>
+        <image class="lingquan"></image>
+        <youhq></youhq>
+        <view class="hr" style="margin-top:40rpx"></view>
+        <list></list>
+    </view>
+</template>
+<script>
+import shopitem from "@/components/shop/shop-item/index"
+import recommend from "@/components/shop/recommend/index"
+import seckill from "@/components/shop/seckill/index"
+import group from "@/components/shop/group/index"
+import youhq from "@/components/shop/youhq/index"
+import list from "../../components/shop/list/index"
+
+export default {
+    name:"shop",
+    components:{
+        shopitem,
+        recommend,
+        seckill,
+        group,
+        youhq,
+        list
+    },
+    data(){
+        return {
+            keyword:"",
+            list:[{
+						image: '/static/uView/swiper/swiper1.jpg',
+						title: '蒹葭苍苍，白露为霜。所谓伊人，在水一方'
+					},
+					{
+						image: '/static/uView/swiper/swiper2.jpg',
+						title: '溯洄从之，道阻且长。溯游从之，宛在水中央'
+					},
+					{
+						image: '/static/uView/swiper/swiper3.jpg',
+						title: '蒹葭萋萋，白露未晞。所谓伊人，在水之湄'
+					}
+				]
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+/deep/image{
+    background-color: #0f0;
+}
+.shop{
+    padding: 0 33rpx;
+    .top{
+        width: 100%;
+        height: 88rpx;
+        display: flex;
+        align-items: center;
+        .local{
+            width: 31rpx;
+            height: 37rpx;
+        }
+    }
+    .add{
+        width: 115rpx;
+        height: 25rpx;
+        display: flex;
+        font-size: 26rpx;
+        color: #333;
+        justify-content: space-between;
+        align-items: center;
+        margin-left: 14rpx;
+        margin-right: 37rpx;
+        >image{
+            width: 24rpx;
+            height: 15rpx;
+        }
+    }
+    .mnue{
+        width: 35rpx;
+        height: 26rpx;
+        margin-left: 36rpx;
+    }
+    .chengnuo{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 24rpx;
+        >view{
+            display: flex;
+            align-items: center;
+            >image{
+                width: 23rpx;
+                height: 23rpx;
+            }
+            >text{
+                font-size: 22rpx;
+                color: #999;
+                margin-left: 8rpx;
+            }
+        }
+    }
+    .fenlei{
+        display: flex;
+        justify-content: space-between;
+        margin-top: 30rpx;
+    }
+    .hr{
+        width: 750rpx;
+        margin-left: -33rpx;
+        height: 20rpx;
+        background-color: #ececec;
+    }
+    .lingquan{
+        width: 750rpx;
+        height: 177rpx;
+        margin-left: -33rpx;
+        margin-top: 29rpx;
+        background-color: #ececec;
+    }
+}  
+</style>
\ No newline at end of file
diff --git a/static/image/mine/1.png b/static/image/mine/1.png
new file mode 100644
index 0000000..e7ac03f
Binary files /dev/null and b/static/image/mine/1.png differ
diff --git a/static/image/mine/13.png b/static/image/mine/13.png
new file mode 100644
index 0000000..ee7078c
Binary files /dev/null and b/static/image/mine/13.png differ
diff --git a/static/image/mine/14.png b/static/image/mine/14.png
new file mode 100644
index 0000000..2075aff
Binary files /dev/null and b/static/image/mine/14.png differ
diff --git a/static/image/mine/15.png b/static/image/mine/15.png
new file mode 100644
index 0000000..f720a02
Binary files /dev/null and b/static/image/mine/15.png differ
diff --git a/static/image/mine/16.png b/static/image/mine/16.png
new file mode 100644
index 0000000..f3f687a
Binary files /dev/null and b/static/image/mine/16.png differ
diff --git a/static/image/mine/17.png b/static/image/mine/17.png
new file mode 100644
index 0000000..9f576ae
Binary files /dev/null and b/static/image/mine/17.png differ
diff --git a/static/image/mine/18.png b/static/image/mine/18.png
new file mode 100644
index 0000000..66a0c16
Binary files /dev/null and b/static/image/mine/18.png differ
diff --git a/static/image/mine/19.png b/static/image/mine/19.png
new file mode 100644
index 0000000..cf67c08
Binary files /dev/null and b/static/image/mine/19.png differ
diff --git a/static/image/mine/2.png b/static/image/mine/2.png
new file mode 100644
index 0000000..cb00cc7
Binary files /dev/null and b/static/image/mine/2.png differ
diff --git a/static/image/mine/20.png b/static/image/mine/20.png
new file mode 100644
index 0000000..7cd550f
Binary files /dev/null and b/static/image/mine/20.png differ
diff --git a/static/image/mine/21.png b/static/image/mine/21.png
new file mode 100644
index 0000000..8aa6d13
Binary files /dev/null and b/static/image/mine/21.png differ
diff --git a/static/image/mine/23.png b/static/image/mine/23.png
new file mode 100644
index 0000000..cae1a3d
Binary files /dev/null and b/static/image/mine/23.png differ
diff --git a/static/image/mine/3.png b/static/image/mine/3.png
new file mode 100644
index 0000000..a102b3f
Binary files /dev/null and b/static/image/mine/3.png differ
diff --git a/static/image/mine/6.png b/static/image/mine/6.png
new file mode 100644
index 0000000..ba7d225
Binary files /dev/null and b/static/image/mine/6.png differ
diff --git a/static/image/mine/9.png b/static/image/mine/9.png
new file mode 100644
index 0000000..52524b4
Binary files /dev/null and b/static/image/mine/9.png differ
diff --git a/static/image/home.png b/static/image/tabbar/home.png
similarity index 100%
rename from static/image/home.png
rename to static/image/tabbar/home.png
diff --git a/static/image/home2.png b/static/image/tabbar/home2.png
similarity index 100%
rename from static/image/home2.png
rename to static/image/tabbar/home2.png
diff --git a/static/image/mall.png b/static/image/tabbar/mall.png
similarity index 100%
rename from static/image/mall.png
rename to static/image/tabbar/mall.png
diff --git a/static/image/mall2.png b/static/image/tabbar/mall2.png
similarity index 100%
rename from static/image/mall2.png
rename to static/image/tabbar/mall2.png
diff --git a/static/image/message.png b/static/image/tabbar/message.png
similarity index 100%
rename from static/image/message.png
rename to static/image/tabbar/message.png
diff --git a/static/image/message2.png b/static/image/tabbar/message2.png
similarity index 100%
rename from static/image/message2.png
rename to static/image/tabbar/message2.png
diff --git a/static/image/mine.png b/static/image/tabbar/mine.png
similarity index 100%
rename from static/image/mine.png
rename to static/image/tabbar/mine.png
diff --git a/static/image/mine2.png b/static/image/tabbar/mine2.png
similarity index 100%
rename from static/image/mine2.png
rename to static/image/tabbar/mine2.png
diff --git a/static/js/http.js b/static/js/http.js
new file mode 100644
index 0000000..fa5bec7
--- /dev/null
+++ b/static/js/http.js
@@ -0,0 +1 @@
+let baseurl = "";