05-30-1

api/user.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { upFilse} from '@/utils/request';
 
 // 订单统计信息
 export function orderData(data) {
@@ -112,3 +113,17 @@ export function getExtensionData(data) {
 }
 
 
+export function uploads(data){
+	return upFilse({
+		url:'/api/upload/image',
+		method:'post',
+		data
+	});
+}
+export function edit(data){
+	return request({
+		url: '/api/user/edit',
+		method:'post',
+		data
+	});
+}

components/seckill/seckill.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="seckill-section m-t" v-if="show">
-		<view class="s-header">
+<!--  <view class="seckill-section m-t" v-if="show">
+    <view class="s-header">
 			<view class="f-left-icon"></view>
 			<view class="tit-box"><text class="tit">限时秒杀</text></view>
 			<view class="tip-box">
@@ -11,236 +11,355 @@
 			</view>
 			<view class="textNav iconfont iconenter" @click="navTo('/pages/product/seckill')">更多</view>
 		</view>
-		<scroll-view class="floor-list" scroll-x>
-			<view class="scoll-wrapper position-relative" @click="navTo('/pages/product/seckill')">
-				<view v-for="(item, index) in list" :key="index" class="floor-item">
+    <scroll-view class="floor-list" scroll-x>
+      <view class="scoll-wrapper position-relative" @click="navTo('/pages/product/seckill')">
+        <view v-for="(item, index) in list" :key="index" class="floor-item">
 					<image class="list-image" :src="item.image" mode="aspectFill"></image>
 					<text class="title clamp">{{ item.title }}</text>
 					<text class="price">￥{{ item.price }}</text>
 				</view>
-				<view v-if="list.length == 0" class="floor-item ">
-					<image class="list-image" mode="aspectFill"></image>
-					<text class="title clamp"></text>
-					<text class="price"></text>
-				</view>
-				<view v-if="list.length == 0" class="noGoodsBg"><view>敬请期待</view></view>
-			</view>
-		</scroll-view>
-	</view>
+        <view v-if="list.length == 0" class="floor-item ">
+          <image class="list-image" mode="aspectFill"></image>
+          <text class="title clamp"></text>
+          <text class="price"></text>
+        </view>
+        <view v-if="list.length == 0" class="noGoodsBg">
+          <view>敬请期待</view>
+        </view>
+      </view>
+    </scroll-view>
+  </view> -->
+  <view class="sckill-wrapper">
+  	<scroll-view scroll-x="true" class="sckill">
+  		<view class="item-wrapper" @click="navTo('/pages/product/seckill')">
+  			<view class="goods-box" v-for="(item, index) in list" :key="index" >
+  				<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
+  				<view class="good-title">{{ item.title }}</view>
+  				<view class="price">
+  					<view class="now-price">￥{{ item.price }}</view>
+  					<view class="old-price">￥{{ item.ot_price }}</view>
+  				</view>
+  			</view>
+        <view v-if="list.length == 0" class="noGoodsBg">
+          <view>敬请期待</view>
+        </view>
+  		</view>
+  	</scroll-view>
+  </view>
 </template>
 
 <script>
-import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
-import { getSeckillList, getSeckillClass } from '@/api/product.js';
-import { timeComputed } from '@/utils/rocessor.js';
-export default {
-	components: {
-		uniCountdown
-	},
-	data() {
-		return {
-			list: [],
-			page: 1,
-			limit: 10,
-			showTime: '', //显示的时间
-			showTImeId: '', //显示时间id用于查询数据
-			stopTimeH: 0,
-			stopTimeM: 0,
-			stopTimeS: 0,
-			// 判断是否所有活动已经结束
-			stop: false, //活动是否已经结束
-			show: false, //是否显示活动
-			status: 0 //获取状态值1为有活动开始中 2为活动未开始 0为活动已经结束
-		};
-	},
-	created: function(e) {
-		// 载入分类
-		this.getClass();
-	},
-	methods: {
-		navTo(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		getList() {
-			getSeckillList(
-				{
-					page: this.page,
-					limit: this.limit
-				},
-				this.showTImeId
-			)
-				.then(e => {
-					this.list = e.data;
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		getClass() {
-			let obj = this;
-			getSeckillClass({})
-				.then(({ data }) => {
-					let arr = data.seckillTime;
-					// 用于判断是否有数据
-					let showDate = false;
-					for (var i = 0; i < arr.length; i++) {
-						let ar = arr[i];
-						if (ar.status === 1 || ar.status === 2) {
-							obj.status = ar.status;
-							// 保存要显示的场次时间
-							obj.showTime = ar.time;
-							// 保存要显示活动商品的id
-							obj.showTImeId = ar.id;
-							// 保存当前状态值
-							// 计算倒计时时间
-							if (ar.status === 1) {
-								obj.timeComputed(ar.stop * 1000);
-							} else {
-								// 获取需要开始
-								let arTime = ar.time.split(':');
-								let h = arTime[0];
-								let m = arTime[1];
-								let time = new Date();
-								// 设置时间
-								time.setHours(h, m, 0);
-								obj.timeComputed(time.getTime());
-							}
-							// 获取商品列表
-							obj.getList();
-							// 保存当前有活动在举行
-							showDate = true;
-							// 任务查询结束跳出循环
-							break;
-						}
-					}
-					// 判断是否有活动
-					if (arr.length > 0) {
-						obj.show = true;
-					}
-					// 判断今天活动是否已经全部结束
-					if (!showDate) {
-						// 保存活动结束最后一个小时的活动商品
-						obj.showTImeId = arr[arr.length - 1].id;
-						// 活动已经结束
-						obj.status = 0;
-						// 获取结束时的商品
-						obj.getList();
-						console.log(obj.status);
-					}
-					// 如果所有场次均已经结束
-				})
-				.catch(e => {
-					uni.showModal({
-						title: JSON.stringify(e)
-					});
-				});
-		},
-		// 计算倒计时时间
-		timeComputed(da) {
-			let obj = this;
-			let stopTime = timeComputed(da)
-			obj.stopTimeH =stopTime.hours;
-			obj.stopTimeM = stopTime.minutes;
-			obj.stopTimeS =stopTime.seconds;
-		}
-	}
-};
+  import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
+  import {
+    getSeckillList,
+    getSeckillClass
+  } from '@/api/product.js';
+  import {
+    timeComputed
+  } from '@/utils/rocessor.js';
+  export default {
+    components: {
+      uniCountdown
+    },
+    data() {
+      return {
+        list: [],
+        page: 1,
+        limit: 10,
+        showTime: '', //显示的时间
+        showTImeId: '', //显示时间id用于查询数据
+        stopTimeH: 0,
+        stopTimeM: 0,
+        stopTimeS: 0,
+        // 判断是否所有活动已经结束
+        stop: false, //活动是否已经结束
+        show: false, //是否显示活动
+        status: 0 //获取状态值1为有活动开始中 2为活动未开始 0为活动已经结束
+      };
+    },
+    created: function(e) {
+      // 载入分类
+      this.getClass();
+    },
+    methods: {
+      navTo(url) {
+        uni.navigateTo({
+          url
+        });
+      },
+      getList() {
+        getSeckillList({
+              page: this.page,
+              limit: this.limit
+            },
+            this.showTImeId
+          )
+          .then(e => {
+            this.list = e.data;
+            console.log(this.list)
+          })
+          .catch(e => {
+            console.log(e);
+          });
+      },
+      getClass() {
+        let obj = this;
+        getSeckillClass({})
+          .then(({
+            data
+          }) => {
+            let arr = data.seckillTime;
+            // 用于判断是否有数据
+            let showDate = false;
+            for (var i = 0; i < arr.length; i++) {
+              let ar = arr[i];
+              if (ar.status === 1 || ar.status === 2) {
+                obj.status = ar.status;
+                // 保存要显示的场次时间
+                obj.showTime = ar.time;
+                // 保存要显示活动商品的id
+                obj.showTImeId = ar.id;
+                // 保存当前状态值
+                // 计算倒计时时间
+                if (ar.status === 1) {
+                  obj.timeComputed(ar.stop * 1000);
+                } else {
+                  // 获取需要开始
+                  let arTime = ar.time.split(':');
+                  let h = arTime[0];
+                  let m = arTime[1];
+                  let time = new Date();
+                  // 设置时间
+                  time.setHours(h, m, 0);
+                  obj.timeComputed(time.getTime());
+                }
+                // 获取商品列表
+                obj.getList();
+                // 保存当前有活动在举行
+                showDate = true;
+                // 任务查询结束跳出循环
+                break;
+              }
+            }
+            // 判断是否有活动
+            if (arr.length > 0) {
+              obj.show = true;
+            }
+            // 判断今天活动是否已经全部结束
+            if (!showDate) {
+              // 保存活动结束最后一个小时的活动商品
+              obj.showTImeId = arr[arr.length - 1].id;
+              // 活动已经结束
+              obj.status = 0;
+              // 获取结束时的商品
+              obj.getList();
+              console.log(obj.status);
+            }
+            // 如果所有场次均已经结束
+          })
+          .catch(e => {
+            uni.showModal({
+              title: JSON.stringify(e)
+            });
+          });
+      },
+      // 计算倒计时时间
+      timeComputed(da) {
+        let obj = this;
+        let stopTime = timeComputed(da)
+        obj.stopTimeH = stopTime.hours;
+        obj.stopTimeM = stopTime.minutes;
+        obj.stopTimeS = stopTime.seconds;
+      }
+    }
+  };
 </script>
 
 <style lang="scss">
-/* 秒杀专区 */
-.seckill-section {
-	padding: 4rpx 30rpx 24rpx;
-	.s-header {
-		display: flex;
-		align-items: center;
-		height: 92rpx;
-		line-height: 1;
-		.tit-box {
-			flex-shrink: 0;
-		}
-		.tit {
-			@extend %font-title;
-		}
-		.f-left-icon {
-			@extend %f-left-icon;
-		}
-		.textNav {
-			line-height: 1;
-			padding: 15rpx 0;
-			flex-shrink: 0;
-			flex-grow: 1;
-			min-width: 100rpx;
-		}
-		.tip-box {
-			flex-grow: 1;
-			display: flex;
-			justify-content: flex-start;
-			align-items: center;
-		}
-		.tip {
-			font-size: $font-sm;
-			color: $font-color-light;
-			padding-left: 10rpx;
-			padding-right: 10rpx;
-		}
-		.timer {
-			display: inline-block;
-			width: 40rpx;
-			height: 36rpx;
-			text-align: center;
-			line-height: 36rpx;
-			margin-right: 14rpx;
-			font-size: $font-sm + 2rpx;
-			color: #fff;
-			border-radius: 2px;
-			background: rgba(0, 0, 0, 0.8);
-		}
-		.iconenter {
-			font-size: $font-sm;
-			color: $font-color-light;
-			flex: 1;
-			text-align: right;
-		}
-	}
-	.floor-list {
-		white-space: nowrap;
-		background-color: white;
-		padding: 20rpx;
-		border-radius: 5rpx;
-		box-shadow: $box-shadow;
-	}
-	.scoll-wrapper {
-		display: flex;
-		align-items: flex-start;
-		.noGoodsBg {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			height: 100%;
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			color: $font-color-light;
-		}
-		.floor-item {
-			width: 150rpx;
-			margin-right: 20rpx;
-			font-size: $font-sm + 2rpx;
-			color: $font-color-dark;
-			line-height: 1.8;
-			.list-image {
-				width: 150rpx;
-				height: 150rpx;
-				border-radius: 6rpx;
-			}
-			.price {
-				color: $color-red;
-			}
-		}
-	}
-}
-</style>
+  /* 秒杀专区 */
+  .seckill-section {
+    padding: 4rpx 30rpx 24rpx;
+
+    .s-header {
+      display: flex;
+      align-items: center;
+      height: 92rpx;
+      line-height: 1;
+
+      .tit-box {
+        flex-shrink: 0;
+      }
+
+      .tit {
+        @extend %font-title;
+      }
+
+      .f-left-icon {
+        @extend %f-left-icon;
+      }
+
+      .textNav {
+        line-height: 1;
+        padding: 15rpx 0;
+        flex-shrink: 0;
+        flex-grow: 1;
+        min-width: 100rpx;
+      }
+
+      .tip-box {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+      }
+
+      .tip {
+        font-size: $font-sm;
+        color: $font-color-light;
+        padding-left: 10rpx;
+        padding-right: 10rpx;
+      }
+
+      .timer {
+        display: inline-block;
+        width: 40rpx;
+        height: 36rpx;
+        text-align: center;
+        line-height: 36rpx;
+        margin-right: 14rpx;
+        font-size: $font-sm + 2rpx;
+        color: #fff;
+        border-radius: 2px;
+        background: rgba(0, 0, 0, 0.8);
+      }
+
+      .iconenter {
+        font-size: $font-sm;
+        color: $font-color-light;
+        flex: 1;
+        text-align: right;
+      }
+    }
+
+    .floor-list {
+      white-space: nowrap;
+      background-color: white;
+      padding: 20rpx;
+      border-radius: 5rpx;
+      box-shadow: $box-shadow;
+    }
+
+    .scoll-wrapper {
+      display: flex;
+      align-items: flex-start;
+
+      .noGoodsBg {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        color: $font-color-light;
+      }
+
+      .floor-item {
+        width: 150rpx;
+        margin-right: 20rpx;
+        font-size: $font-sm + 2rpx;
+        color: $font-color-dark;
+        line-height: 1.8;
+
+        .list-image {
+          width: 150rpx;
+          height: 150rpx;
+          border-radius: 6rpx;
+        }
+
+        .price {
+          color: $color-red;
+        }
+      }
+    }
+  }
+  .sckill-wrapper {
+  	width: 701rpx;
+  	height: 293rpx;
+  	background-image: url(../../static/img/sckillbg.png);
+  	background-size: 100% 100%;
+  	margin: 34rpx auto 37rpx;
+  	padding: 31rpx 21rpx;
+  	.sckill {
+  		width: 659rpx;
+  		height: 231rpx;
+      .noGoodsBg {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        color: $font-color-light;
+      }
+  		.item-wrapper {
+  			display: flex;
+  			.goods-box {
+  				width: 192rpx;
+  				height: 231rpx;
+  				margin: 0 42rpx 0 0;
+  				flex-shrink: 0;
+  				.image-wrapper {
+  					width: 192rpx;
+  					height: 150rpx;
+  					border-radius: 10rpx;
+  					overflow: hidden;
+  					image {
+  						width: 100%;
+  						height: 100%;
+  						opacity: 1;
+  					}
+  				}
+  				.good-title {
+  					padding: 15rpx 0rpx 0rpx 6rpx;
+  					font-size: 26rpx;
+  					font-weight: 500;
+  					color: #333333;
+  					line-height: 26rpx;
+  					opacity: 0.8;
+  					white-space: nowrap;
+  					overflow: hidden;
+  					text-overflow: ellipsis;
+  				}
+  				.price {
+  					display: flex;
+  					height: 39rpx;
+  					justify-content: space-between;
+  					.now-price {
+  						// padding-top:19rpx ;
+  						font-size: 24rpx;
+  						font-weight: bold;
+  						color: #901b21;
+  						line-height: 16rpx;
+  						// padding-left: 10rpx;
+  						align-self: flex-end;
+  					}
+  					.old-price {
+  						// padding-top:27rpx ;
+  						align-self: flex-end;
+  						font-size: 20rpx;
+  						font-weight: 500;
+  						text-decoration: line-through;
+  						color: #9d9d9d;
+  						line-height: 16rpx;
+  						// padding-right: 10rpx;
+  					}
+  				}
+  			}
+  		}
+  	}
+  }
+</style>

manifest.json

@@ -73,11 +73,10 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://192.168.0.101/api",
-                    // "changeOrigin": true,
-                    "pathRewrite" : {
-                        "/api" : "" // rewrite path
-                    }
+                    "target" : "http://base.liuniu946.com", //请求的目标域名
+                    "changeOrigin" : true,
+                    // "secure": false,
+                    "pathRewrite" : {}
                 }
             }
         }

pages.json

@@ -136,12 +136,12 @@
 		{
 			"path": "pages/product/groupBooking/productGroup",
 			"style": {
-				"navigationBarTitleText": "拼团详情展示",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
+				"navigationBarTitleText": "商品详情"
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "transparent"
+				// 	}
+				// }
 			}
 		},
 		// {
@@ -319,12 +319,12 @@
 		{
 			"path": "pages/user/award",
 			"style": {
-				"navigationBarTitleText": "奖励明细",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
+				"navigationBarTitleText": "我的佣金"
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "transparent"
+				// 	}
+				// }
 			}
 		},
 		{

pages/index/index.vue

@@ -39,44 +39,7 @@
 			<text class="iconfont iconenter" @click="loadMore('/pages/product/seckill')">更多</text>
 		</view>
 		<!-- 秒杀商品 -->
-		<view class="sckill-wrapper">
-			<scroll-view scroll-x="true" class="sckill">
-				<view class="item-wrapper">
-					<view class="goods-box">
-						<view class="image-wrapper"><image src="../../static/img/good1.jpg" mode="scaleToFill"></image></view>
-						<view class="good-title">麻辣砂锅麻辣麻辣砂锅麻辣</view>
-						<view class="price">
-							<view class="now-price">￥77</view>
-							<view class="old-price">￥99</view>
-						</view>
-					</view>
-					<view class="goods-box">
-						<view class="image-wrapper"><image src="../../static/img/good1.jpg" mode="scaleToFill"></image></view>
-						<view class="good-title">麻辣砂锅麻辣麻辣砂锅麻辣</view>
-						<view class="price">
-							<view class="now-price">￥77</view>
-							<view class="old-price">￥99</view>
-						</view>
-					</view>
-					<view class="goods-box">
-						<view class="image-wrapper"><image src="../../static/img/good1.jpg" mode="scaleToFill"></image></view>
-						<view class="good-title">麻辣砂锅麻辣麻辣砂锅麻辣</view>
-						<view class="price">
-							<view class="now-price">￥77</view>
-							<view class="old-price">￥99</view>
-						</view>
-					</view>
-					<view class="goods-box">
-						<view class="image-wrapper"><image src="../../static/img/good1.jpg" mode="scaleToFill"></image></view>
-						<view class="good-title">麻辣砂锅麻辣麻辣砂锅麻辣</view>
-						<view class="price">
-							<view class="now-price">￥77</view>
-							<view class="old-price">￥99</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
+	  <seckill></seckill> 
 		<!-- 超值拼团title -->
 		<view class="m-tap">
 			<image src="../../static/img/groupBooking.png" mode=""></image>
@@ -242,7 +205,7 @@
 		</scroll-view> -->
 
 		<!-- 秒杀楼层 -->
-		<seckill></seckill>
+		<!-- <seckill></seckill> -->
 		<!-- 砍价 -->
 		<view class="hot-goods">
 			<view class="hot-headers flex-upDown-center">
@@ -599,6 +562,12 @@ export default {
 			});
 		}
 		// #endif
+    uni.request({
+      complete(res) {
+        console.log(res)
+      },
+      url:'http://base.liuniu946.com/api/index'
+    })
 	},
 	onShow: function() {
 		// 判断是否强制登录
@@ -1563,12 +1532,6 @@ page {
 	.sckill {
 		width: 659rpx;
 		height: 231rpx;
-		// background-color: #bfa;
-		// display: flex;
-		// flex-direction: row;
-		// flex-wrap: nowrap;
-		// overflow: hidden;
-		// margin: auto;
 		.item-wrapper {
 			display: flex;
 			.goods-box {

pages/order/createOrder.vue

@@ -1,9 +1,15 @@
 <template>
 	<view>
-		<view class="navbar">
+		<view class="navbar" style="display: none;">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
-
+    <view class="top-nav">
+      <view class="top-title">收货方式</view>
+      <view class="top-btn">
+        <view :class="{'action':tabCurrentIndex=== 0}" @click="tabClick(0)">外送</view>
+        <view :class="{'action':tabCurrentIndex=== 1}" @click="tabClick(1)">自提</view>
+      </view>
+    </view>
 		<!-- 地址 -->
 		<navigator v-if="tabCurrentIndex == 0" url="/pages/set/address?source=1" class="address-section">
 			<view class="order-content" v-if="addressData.real_name">
@@ -823,4 +829,41 @@ page {
 		}
 	}
 }
+.top-nav {
+  width: 750rpx;
+  height: 94rpx;
+  background: #FFFFFF;
+  display: flex;
+  padding: 0 27rpx 0 35rpx;
+  justify-content: space-between;
+  align-items: center;
+  .top-title {
+    line-height: 94rpx;
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #333333;
+  }
+  .top-btn {
+    width: 168rpx;
+    height: 56rpx;
+    background: #901b21;
+    border-radius: 14rpx;
+    padding: 4rpx;
+    display: flex;
+    justify-content: space-between;
+    view {
+     width: 76rpx;
+     height: 48rpx;
+
+     border-radius: 12rpx; 
+     text-align: center;
+     color:#fff;
+     background: #901b21;
+    }
+    .action {
+      color: #901b21;
+      background: #FFFFFF;
+    }
+  }
+}
 </style>

pages/order/order.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="content">
-		<view class="navbar">
+		<view class="navbar" v-if="isUser === '0'">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
-		<view class="navbar">
+		<view class="navbar" v-else>
 			<view v-for="(item, index) in navShopList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
 
@@ -176,15 +176,18 @@ export default {
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				}
-			]
+			],
+      isUser: true
 		};
 	},
-
 	onLoad(options) {
 		/**
 		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
 		 * 替换onLoad下代码即可
 		 */
+    console.log(options)
+    this.isUser = options.isUser
+    console.log(this.isUser)
 		this.tabCurrentIndex = +options.state;
 		// #ifndef MP
 		this.loadData();

pages/product/common/groupBottom.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="goods-pay-box ">
 		<view class="goods-pay-buttom flex" v-if="!seckillObj.stop">
-			<view class="goods-pay bg-pinks">
+			<!-- <view class="goods-pay bg-pinks"> -->
 			<!-- 	<view class="goods-pay-o flex">
 					<view class="title">本单发起人奖金</view>
 					<view class="money">{{peopleMoney}}元</view>
@@ -10,12 +10,12 @@
 					本单销售额佣金
 					<text>？%</text>
 				</view> -->
-				发起拼团得奖金
-			</view>
+				<!-- 发起拼团得奖金 -->
+			<!-- </view> -->
 			<!-- 单规格 -->
-			<view class="goods-pay bg-danger" v-if="many == 1" @click="buy(1)"><view class="goods-buttom">一键开团</view></view>
+			<view class="goods-pay bg-danger" v-if="many == 1" @click="buy(1)"><view class="goods-buttom">立即参团</view></view>
 			<!-- 多规格 -->
-			<view class="goods-pay bg-danger" v-else @click="buys"><view class="goods-buttom">一键开团</view></view>
+			<view class="goods-pay bg-danger" v-else @click="buys"><view class="goods-buttom">立即参团</view></view>
 		</view>
 		<view class="goods-pay-stop" v-else>活动已结束</view>
 	</view>
@@ -79,8 +79,12 @@ export default {
 	background-color: #ffffff;
 	.goods-pay-buttom {
 		overflow: hidden;
-		border-radius: 99rpx;
-		height: 100%;
+		// border-radius: 99rpx;
+		// height: 100%;
+    width: 699rpx;
+    height: 90rpx;
+    // background: linear-gradient(90deg, #FE6F61 0%, #FF4343 100%);
+    border-radius: 45rpx;
 	}
 	.bgLine {
 		background: linear-gradient(90deg, rgba(239, 78, 81, 1) 0%, rgba(244, 113, 59, 1) 100%);
@@ -100,12 +104,14 @@ export default {
 
 		&.bg-danger {
 			// background:linear-gradient(14deg,rgba(254,107,38,1),rgba(255,50,40,1));
-			background: linear-gradient(270deg, #5dbc7c 0%, #5dbc7c 100%);
+			// background: linear-gradient(270deg, #5dbc7c 0%, #5dbc7c 100%);
+      // background:linear-gradient(14deg,rgba(254,107,38,1),rgba(255,50,40,1));
+      background: #901b21 !important;
 		}
 		.goods-pay-o {
 			border: 1px solid #ddffdf;
 			.title {
-				background:linear-gradient(14deg,rgba(254,107,38,1),rgba(255,50,40,1));
+				
 				padding: 5rpx 10rpx;
 				border-radius: 5rpx;
 				line-height: 1;

pages/product/common/groupContent.vue

@@ -4,7 +4,7 @@
 			{{goodsObjact.title}}
 			<!-- <text class="tip-o">截单后8小时到货</text> -->
 		</text>
-		<!-- <button open-type="share" class="shareDate flex_item">
+<!-- 		<button open-type="share" class="shareDate flex_item">
 			<image class="share-img" src="/static/img/img085.png"></image>
 			<view class="name">分享</view>
 		</button> -->
@@ -20,6 +20,11 @@
 			￥{{ goodsObjact.product_price }}
 			<text>市场价</text>
 		</view> -->
+    <view class="good-base">
+      <view class="postage">邮费：{{goodsObjact.postage}}</view>
+      <view class="stock">剩余：{{goodsObjact.stock}}</view>
+      <view class="addr">浙江省 台州市</view>
+    </view>
 	</view>
 </template>
 
@@ -65,6 +70,7 @@ export default {
 	background: #fff;
 	padding: 35rpx 0rpx;
 	padding-left: 35rpx;
+  margin-bottom: 15rpx;
 	.title {
 		font-size: 32rpx;
 		color: $font-color-dark;
@@ -144,5 +150,15 @@ export default {
 			margin-left: 15rpx;
 		}
 	}
+  .good-base {
+    padding-top: 20rpx;
+    display: flex;
+    // padding: 0 30rpx;
+    padding-right: 30rpx;
+    justify-content: space-between;
+    font-size: 24rpx;
+    font-weight: 500;
+    color: #999999;
+  }
 }
 </style>

pages/product/common/groupTime.vue

@@ -1,27 +1,33 @@
 <template>
 	<view class="introduce-section seckill-box-title">
 		<view class="title flex" style="width: 100%;">
-			<view class="title-left flex">
-				<view class="title-box flex_item">
+			<view class="title-left ">
+        <view class="price-info">
+          <view class="all-price">￥<text class="now-price">{{ goodsObjact.price }}</text><text class="old-price">￥{{goodsObjact.product_price}}</text><text class="pt-num">{{ goodsObjact.people }}人团1人中</text></view>
+        </view>
+        <view class="pt-title">
+          拼中可得200积分，未拼中可得￥1.50元补贴
+        </view>
+<!-- 				<view class="title-box flex_item">
 					<view class="title-o">
 						<view class="price-tip flex">
 							<view class="tip-info">¥</view>
-							<text class="price">{{ goodsObjact.price }}</text>
+							<text class="price" style="font-size: 24rpx;">{{ goodsObjact.price }}</text>
 						</view>
 					</view>
 					<view class="title-t">
 						<view class="peice-out"></view>
-						<view class="num">{{ goodsObjact.people }}人起团</view>
+						<view class="num">{{ goodsObjact.people }}人团1人中</view>
 					</view>
-				</view>
-				<view class="group flex">
+				</view> -->
+				<!-- <view class="group flex">
 					<image src="/static/img/img064.png"></image>
 					<view class="text">{{goodsObjact.pink_type}}</view>
-				</view>
+				</view> -->
 			</view>
-			<view class="timeStop">
+			<!-- <view class="timeStop">
 				<view class="item">
-					<view class="timeStop-name">距离结束</view><!-- #FF3334 -->
+					<view class="timeStop-name">距离结束</view>
 					<uni-countdown
 						class="timeBox"
 						color="#ffffff"
@@ -33,7 +39,11 @@
 						:second="seckillObj.stopTimeS"
 					></uni-countdown>
 				</view>
-			</view>
+			</view> -->
+      <button class="shop-share" open-type="share">
+        <view class="share-icon"><image src="../../../static/icon/share.png" mode=""></image></view>
+        <view class="share-title">拼团分享</view>
+      </button>
 		</view>
 	</view>
 </template>
@@ -81,41 +91,58 @@ export default {
 .introduce-section {
 	position: relative;
 	background: #fff;
+  // outline: 1rpx red solid;
+  box-shadow: 10rpx 10rpx 10rpx rgba(0,0,0,0.2);
+  z-index: 998;
 	.title {
+    // background-color: #901b21;
 		font-size: 32rpx;
 		color: $font-color-dark;
+    // background-color: #901b21;
+    // box-shadow: 10px 10px 10px red !important;
 		.tip-o {
 			color: #ff3334;
 			padding-left: 15rpx;
 		}
 		.title-left {
-			padding: 15rpx;
+			// padding: 15rpx;
 			width: 560rpx;
+      background-color: #901b21;
+      height: 121rpx;
+      padding: 25rpx 0 0 25rpx;
+      color: #fff;
+      .price-info {
+        
+      }
 		}
 	}
 	.title-box {
 		color: #ffffff;
 		.title-o {
 			.price {
-				font-size: 65rpx !important;
+				font-size: 32rpx !important;
 				position: relative;
 				top: 8rpx;
 			}
 		}
 		.title-t {
-			font-size: 24rpx !important;
+			font-size: 20rpx !important;
 			position: relative;
-			bottom: 10rpx;
-			padding-left: 10rpx;
-			top: 10rpx;
+			top: 0rpx;
+			
+			// top: 10rpx;
+      // background-color: #c9969a;
+      // border-radius: 3rpx 3rpx;
 			.peice-out {
 				text-decoration: line-through;
 			}
 			.num {
-				margin-top: 10rpx;
-				background-color: #ffffff;
-				color: #ff3a56;
-				border-radius: 8rpx;
+				// margin-top: 10rpx;
+        padding:6rpx 8rpx 6rpx 130rpx;
+        border: 6rpx solid #c9969a;
+				background-color: #c9969a;
+				color: #fff;
+				border-radius: 20rpx 20rpx;
 				padding: 0 5rpx ;
 				float: left;
 			}
@@ -169,10 +196,46 @@ export default {
 		left: 0;
 		margin-right: 10rpx;
 	}
+  .shop-share {
+    border: none;
+    
+    width: 146rpx;
+    height: 121rpx;
+    background: #FFFFFF;
+    display: felx;
+    align-items: center;
+    // border-radius: 0 2rpx 2rpx 0;
+    padding: 25rpx 0 0 0;
+    .share-icon {
+      width: 42rpx;
+      height: 42rpx;
+      margin: 0 auto 15rpx;
+      image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .share-title {
+      font-size: 24rpx;
+      font-weight: bold;
+      color: #262A35;
+      margin: 0 auto;
+      text-align: center;
+      line-height: 1;
+    }
+  }
 }
 .seckill-box-title {
 	// background:linear-gradient(14deg,rgba(254,107,38,1),rgba(255,50,40,1)) !important;
-	background: linear-gradient(270deg, #5dbc7c 0%, #5dbc7c 100%) !important;
+	// background: linear-gradient(270deg, #5dbc7c 0%, #5dbc7c 100%) !important;
+  // background: #901b21;
+  overflow: hidden;
+  width: 694rpx;
+  height: 121rpx;
+  border-radius: 10rpx 10rpx;
+  top: -60.5rpx;
+  left: 28rpx;
+  margin-bottom: -60.5rpx;
 	.price,
 	.m-price {
 		color: #ffffff !important;
@@ -183,13 +246,43 @@ export default {
 	}
 	.tip-info{
 		position: relative;
-		top:18rpx;
-		font-size: 32rpx !important;
-		padding-right: 8rpx;
-	}
-	.price {
-		font-size: 45rpx !important;
-		font-weight: bold;
+		top:8rpx;
+		font-size: 22rpx !important;
+		padding-right: 4rpx;
+    font-weight: bold;
+   
+    }
 	}
+  .price {
+  	font-size: 80rpx !important;
+  	font-weight: bold;
+	
+}
+.all-price {
+  font-size: 18rpx;
+  font-weight: 500;
+  .now-price {
+    font-size: 32rpx;
+    font-weight: bold;
+  }
+  .pt-num {
+    
+    display: inline-block;
+    font-size: 20rpx;
+    background-color: #c9969a;
+    padding: 6rpx 6rpx 8rpx 13rpx;
+    border-radius: 20rpx 20rpx;
+    position: relative;
+    bottom: 8rpx;
+  }
+  .old-price {
+    // display: inline;
+    margin: 0 7rpx;
+    text-decoration: line-through;
+  }
+}
+.pt-title {
+  font-size: 24rpx;
+  font-weight: 500;
 }
 </style>

pages/product/common/topSwiper.vue

@@ -31,7 +31,7 @@ export default {
 	/* #ifdef APP-PLUS */
 	padding-top: var(--status-bar-height);
 	/* #endif */
-	height: 700rpx;
+	height: 520rpx;
 	position: relative;
 	swiper {
 		height: 100%;
@@ -44,7 +44,7 @@ export default {
 		display: flex;
 		justify-content: center;
 		align-content: center;
-		height: 700rpx;
+		height: 520rpx;
 		overflow: hidden;
 		image {
 			width: 100%;

pages/product/groupBooking/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- <view class="lyy-bg4">
+<!-- 	<view class="lyy-bg4">
 		<view class="lyy-f-a">
 			<view class="lyy-f-b lyy-flex">
 				<view class="lyy-f-c item" @click="goProduct(items)" v-for="(items, ind) in goodsList" :key="ind">
@@ -23,41 +23,21 @@
 	</view> -->
 	<view class="czpt">
 		<view class="good-wrapper">
-			<view class="spgood">
-				<view class="left-wrapper"><image src="../../../static/img/spimg1.jpg" mode="scaleToFill"></image></view>
+			<view class="spgood" @click="goProduct(items)" v-for="(items, ind) in goodsList" :key="ind">
+				<view class="left-wrapper"><image :src="items.image" mode="scaleToFill"></image></view>
 				<view class="right-wrapper">
-					<view class="right-title">湿热肝上火气肺痰煲汤材料</view>
+					<view class="right-title clamp">{{ items.title }}</view>
 					<view class="ex-addr">
 						<image src="../../../static/img/shop.png" mode="" class="name-img"></image>
-						子臣台州旗舰店
+            {{items.unit_name}}
 						<image src="../../../static/img/point.png" mode="" class="point-img"></image>
 						200m
 					</view>
-					<view class="pepple-num"><image src="../../../static/icon/hot.png" mode="scaleToFill"></image>2人团</view>
+					<view class="pepple-num"><image src="../../../static/icon/hot.png" mode="scaleToFill"></image> &ensp;&ensp;{{  items.people }}人团</view>
 					<view class="right-bottom">
 						<view class="sp-price">
-							<view class="now-price">￥77</view>
-							<view class="old-price">￥99</view>
-						</view>
-						<view class="sp-btn">马上拼团</view>
-					</view>
-				</view>
-			</view>
-			<view class="spgood">
-				<view class="left-wrapper"><image src="../../../static/img/spimg1.jpg" mode="scaleToFill"></image></view>
-				<view class="right-wrapper">
-					<view class="right-title">湿热肝上火气肺痰煲汤材料</view>
-					<view class="ex-addr">
-						<image src="../../../static/img/shop.png" mode="" class="name-img"></image>
-						子臣台州旗舰店
-						<image src="../../../static/img/point.png" mode="" class="point-img"></image>
-						200m
-					</view>
-					<view class="pepple-num"><image src="../../../static/icon/hot.png" mode="scaleToFill"></image>2人团</view>
-					<view class="right-bottom">
-						<view class="sp-price">
-							<view class="now-price">￥77</view>
-							<view class="old-price">￥99</view>
+							<view class="now-price">￥{{ items.price * 1 }}</view>
+							<view class="old-price">￥{{ items.product_price * 1 }}</view>
 						</view>
 						<view class="sp-btn">马上拼团</view>
 					</view>
@@ -76,18 +56,14 @@ export default {
 	},
 	data() {
 		return {
-			goodsList: [
-				{ title: '鸭血粉丝鸭血粉丝鸭血粉丝', price: '99', people: 99 },
-				{ title: '鸭血粉丝鸭血粉丝鸭血粉丝', price: '33', people: 66 },
-				{ title: '鸭血粉丝鸭血粉丝鸭血粉丝', price: '44', people: 22 }
-			],
+			goodsList: [],
 			loadingType: 'more', //加载更多状态
 			limit: 20, //每次加载数据条数
 			page: 1 //当前页数
 		};
 	},
 	onLoad(options) {
-		// this.loadData();
+		this.loadData();
 	},
 	//下拉刷新
 	onPullDownRefresh() {
@@ -311,11 +287,12 @@ page {
 			// background-color: red;
 			.right-title {
 				padding-top: 8rpx;
-				width: 100%;
+				width: 400rpx;
 				// height: 29rpx;
 				font-size: 30rpx;
 				font-weight: bold;
 				color: #333333;
+        
 			}
 			.right-addr {
 				margin-top: 18rpx;
@@ -372,7 +349,9 @@ page {
 				}
 			}
 			.pepple-num {
-				width: 99rpx;
+				// width: 99rpx;
+        display: inline-block;
+        padding-right: 15rpx;
 				height: 36rpx;
 				// color: #ff3366;
 				// background: #FC7A0C;
@@ -388,6 +367,8 @@ page {
 				image {
 					width: 17rpx;
 					height: 20rpx;
+          margin-right: 10rpx;
+          // padding-right: rpx;
 				}
 			}
 			.right-bottom {

pages/product/groupBooking/productGroup.vue

@@ -4,6 +4,7 @@
 		<top-swiper :imgList="imgList"></top-swiper>
 		<!-- 拼团倒计时 -->
 		<group-time :goodsObjact="goodsObjact" :key='goodsObjact.product_price' :seckillObj="seckillObj"></group-time>
+    <view class="jg"></view>
 		<!-- 拼团标题 -->
 		<group-content :goodsObjact="goodsObjact"></group-content>
 		<!-- 拼团到货时间及优惠 -->
@@ -605,7 +606,8 @@
 				height: 66rpx;
 				line-height: 66rpx;
 				border-radius: 100rpx;
-				background: $uni-color-primary;
+				// background: $uni-color-primary;
+        background-color: #901b21;
 				font-size: $font-base + 2rpx;
 				color: #fff;
 				margin: 30rpx auto 20rpx;
@@ -677,7 +679,7 @@
 	
 				.price {
 					font-size: $font-lg;
-					color: $uni-color-primary;
+					color: #901b21;
 					margin: 10rpx 0rpx;
 				}
 	
@@ -727,8 +729,9 @@
 			}
 	
 			.selected {
-				background: #ddffdf;
-				color: $uni-color-primary;
+				// background: #ddffdf;
+        background-color: rgba($color: #901b21, $alpha: 0.2);
+				color: #901b21;
 			}
 		}
 	}
@@ -931,4 +934,11 @@
 			}
 		}
 	}
+  .jg {
+    background-color: #fff;
+    height: 60.5rpx;
+    position: relative;
+    top: -60.5rpx;
+    margin-bottom: -60.5rpx;
+  }
 </style>

pages/set/addressManage.vue

@@ -24,11 +24,13 @@
 				:switch-checked="addressData.default"
 				:show-switch="true"
 				:show-arrow="false"
-				switch-color="#5dbc7c"
+				switch-color="#921a23"
 				@switchChange="switchChange"
 			></uni-list-item>
 		</uni-list>
-
+    <view class="del-btn" v-if="showDel">
+      <text @click="delAddr">删除地址</text>
+    </view>
 		<button class="add-btn" @click="confirm">提交</button>
 	</view>
 </template>
@@ -38,7 +40,7 @@ import uniList from '@/components/uni-list/uni-list.vue';
 import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
 import  pickerAddress from '@/components/wangding-pickerAddress/wangding-pickerAddress.vue';
-import { addressEdit } from '@/api/user.js';
+import { addressEdit, addressDel } from '@/api/user.js';
 export default {
 	components: {
 		uniList,
@@ -58,17 +60,20 @@ export default {
 					district: ''
 				},
 				area: '',
-				default: false
+				default: false,
+        showDel: false
 			}
 		};
 	},
 	onLoad(option) {
+    this.showDel = false
 		let title = '新增收货地址';
 		if (option.type === 'edit') {
 			title = '编辑收货地址';
 			let data = JSON.parse(option.data);
 			console.log(data);
-
+      
+      this.showDel = true
 			this.addressData = {
 				name: data.real_name,
 				mobile: data.phone,
@@ -111,6 +116,17 @@ export default {
 		switchChange(e) {
 			this.addressData.default = e.value;
 		},
+    //删除地址
+    delAddr() {
+      addressDel({id:this.addressData.id}).then(({data})=>{
+				this.$api.msg('删除成功')
+        setTimeout(()=>{
+          uni.redirectTo({url:'/pages/set/address'})
+        },1000)
+        
+			})
+      console.log('删除')
+    },
 		//提交
 		confirm() {
 			let obj = this;
@@ -199,6 +215,17 @@ page {
 		transform: translateX(16rpx) scale(0.9);
 	}
 }
+.del-btn {
+  width: 750rpx;
+  height: 99rpx;
+  margin-top: 28rpx;
+  font-size: 30rpx;
+  font-weight: 500;
+  color: #901B21;
+  background-color: #fff;
+  line-height: 99rpx;
+  padding-left: 42rpx;
+}
 .add-btn {
 	display: flex;
 	align-items: center;

pages/set/set.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+<!-- 	<view class="container">
 		<uni-list>
 		    <uni-list-item title="个人资料" @click="navTo('/pages/set/userinfo')" ></uni-list-item>
 			<uni-list-item title="修改密码" @click="navTo('/pages/set/password')" ></uni-list-item>
@@ -22,62 +22,159 @@
 		<view class="list-cell log-out-btn" @click="toLogout">
 			<text class="cell-tit">退出登录</text>
 		</view>
-	</view>
+	</view> -->
+  <view class="container">
+  	<view class="row b-b flex jg">
+  		<text class="tit">头像</text>
+  		<image :src="userInfo.avatar" @click.stop="imgsub"></image>
+  	</view>
+  	<view class="row b-b flex">
+  		<text class="tit">昵称</text>
+  		<input class="input" v-model="userInfo.nickname" type="text" placeholder-class="placeholder" />
+  	</view>
+  	<view class="row b-b flex">
+  		<text class="tit">ID</text>
+  		<input class="input" v-model="userInfo.uid" type="text" disabled="true" placeholder-class="placeholder" />
+  	</view>
+  	<view class="row b-b flex">
+  		<text class="tit">用户账号</text>
+  		<input class="input" v-model="userInfo.account || userInfo.phone" type="number" disabled="true" placeholder-class="placeholder" />
+  	</view>
+  	<view class="submit-box flex" >
+  		<view class="submit" @click="edit">确认修改</view>
+  		<!-- <view class="submit" @click="toLogout">退出登录</view> -->
+  	</view>
+  	
+  </view>
 </template>
 
 <script>
-	import uniList from "@/components/uni-list/uni-list.vue"
-	import uniListItem from "@/components/uni-list-item/uni-list-item.vue"
-	import { logout } from '@/api/set.js';
-	import {  
-	    mapMutations  
-	} from 'vuex';
-	export default {
-		components: {
-			uniList,uniListItem
-		},
-		data() {
-			return {
+	// import uniList from "@/components/uni-list/uni-list.vue"
+	// import uniListItem from "@/components/uni-list-item/uni-list-item.vue"
+	// import { logout } from '@/api/set.js';
+	// import {  
+	//     mapMutations  
+	// } from 'vuex';
+	// export default {
+	// 	components: {
+	// 		uniList,uniListItem
+	// 	},
+	// 	data() {
+	// 		return {
 				
-			};
-		},
-		methods:{
-			...mapMutations('user',['logout']),
-			navTo(url){
-				uni.navigateTo({
-					url:url
-				})
-			},
-			//退出登录
-			toLogout(){
-				let obj = this;
-				uni.showModal({
-				    content: '确定要退出登录么',
-				    success: (e)=>{
-				    	if(e.confirm){
-							logout({}).then((e) => {
-								uni.navigateBack();
-							}).catch((e) => {
-								console.log(e);
-							})
-				    		obj.logout();
-				    	}
-				    }
-				});
-			},
-			//switch切换触发方法
-			switchChange(e){
-				console.log(e);
-				let statusTip = e.value ? '打开': '关闭';
-				this.$api.msg(`${statusTip}消息推送`);
-			},
+	// 		};
+	// 	},
+	// 	methods:{
+	// 		...mapMutations('user',['logout']),
+	// 		navTo(url){
+	// 			uni.navigateTo({
+	// 				url:url
+	// 			})
+	// 		},
+	// 		//退出登录
+	// 		toLogout(){
+	// 			let obj = this;
+	// 			uni.showModal({
+	// 			    content: '确定要退出登录么',
+	// 			    success: (e)=>{
+	// 			    	if(e.confirm){
+	// 						logout({}).then((e) => {
+	// 							uni.navigateBack();
+	// 						}).catch((e) => {
+	// 							console.log(e);
+	// 						})
+	// 			    		obj.logout();
+	// 			    	}
+	// 			    }
+	// 			});
+	// 		},
+	// 		//switch切换触发方法
+	// 		switchChange(e){
+	// 			console.log(e);
+	// 			let statusTip = e.value ? '打开': '关闭';
+	// 			this.$api.msg(`${statusTip}消息推送`);
+	// 		},
 
-		}
-	}
+	// 	}
+	// }
+  import uniList from '@/components/uni-list/uni-list.vue';
+  import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+  import { mapState, mapMutations } from 'vuex';
+  import { logout } from '@/api/set.js';
+  import {
+  		uploads,edit
+  	} from '@/api/user.js';
+  export default {
+  	components: {
+  		uniList,
+  		uniListItem
+  	},
+  	data() {
+  		return {
+  			// nickName:'李淡淡',
+  			// id:'HFBNXISN',
+  			// account:'13745262356',
+  			userInfo:'',
+  		};
+  	},
+  	onLoad() {
+  		this.userInfo = uni.getStorageSync('userInfo') || '';
+      console.log(this.userInfo)
+  	},
+  	methods: {
+  		...mapMutations('user',['logout']),
+  		//退出登录
+  		toLogout() {
+  			let obj = this;
+  			uni.showModal({
+  				content: '确定要退出登录么',
+  				success: e => {
+  					if (e.confirm) {
+  						logout({}).then(e => {
+  							obj.logout();
+  							uni.navigateTo({
+  								url:'/pages/public/login'
+  							})
+  						})
+  						.catch(e => {
+  							console.log(e);
+  						});
+  					}
+  				}
+  			});
+  		},
+  		imgsub() {
+  			console.log('上传头像')
+  			uploads({
+  				filename: ''
+  			}).then(data => {
+  				console.log("data",data);
+  				this.userInfo.avatar = data[0].url;
+  			})
+  		},
+  		edit() {
+  			const that = this;
+  			edit({
+  				avatar: this.userInfo.avatar,
+  				nickname: this.userInfo.nickname
+  			}).then( e =>{
+  				that.$api.msg('修改成功');
+  				setTimeout(()=> {
+  					uni.switchTab({
+  						url:'/pages/user/user'
+  					});
+  				}, 1000);
+  			}).catch(e =>{
+  				console.log(e);
+  				that.$api.msg('修改失败');
+  			})
+  		}
+  	}
+  };
 </script>
 
 <style lang='scss'>
-	page{
+	/* page{
 		background: $page-color-base;
 	}
 	.list-cell{
@@ -109,5 +206,43 @@
 		switch{
 			transform: translateX(16rpx) scale(.84);
 		}
-	}
+	} */
+  page {
+    background-color: #f3f3f3;
+  	min-height: 100%;
+  	.container{
+  		height: 100%;
+  		
+  	}
+  }
+  .row {
+    background-color: #fff;
+  	padding: 42rpx 25rpx;
+  	font-size: 30rpx;
+  	color: #333333;
+  	image{
+  		width: 80rpx;
+  		height: 80rpx;
+  		border-radius: 50%;
+  	}
+  	.input {
+  		text-align: right;
+  		color: #333333;
+  	}
+  }
+  .submit-box{
+  		 padding-top: 157rpx;
+  		.submit{
+  			margin: 40rpx auto;
+  			width: 560rpx;
+  			background-color: #901b21;
+  			color: #FFFFFF;
+  			text-align: center;
+  			padding:26rpx 0rpx;
+  			border-radius: 50rpx;
+  		}
+  	}
+    .jg {
+      margin-bottom: 20rpx;
+    }
 </style>

pages/user/award.vue

@@ -2,11 +2,11 @@
 	<view class="content">
 		<view class="content-money">
 			<view class="money-box">
-				<view class="text">可提现佣金（元）</view>
-				<view class="money">{{ money | getMoneyStyle }}</view>		
+				<!-- <view class="text">可提现佣金（元）</view> -->
+				<view class="money"><text>￥</text>{{ money | getMoneyStyle }}</view>		
 			</view>
-			<view class="moneyTx" @click="navto('./withdrawal')">提现</view>
-			<view class="flex buttom-box">
+			
+			<!-- <view class="flex buttom-box">
 				<view class="buttom" @click="navto('/pages/money/recharge')">
 					<view class="icon"><image src="/static/icon/i6.png" mode="aspectFill" class="icon-img"></image></view>
 					<text>统计</text>
@@ -16,7 +16,7 @@
 					<view class="icon"><image src="/static/icon/i7.png" mode="aspectFill" class="icon-img"></image></view>
 					<text>提现</text>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="navbar">
 			<view v-for="(item,index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index}" @click="tabClick(index)">{{ item.text }}</view>
@@ -45,6 +45,7 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+    <view class="moneyTx" @click="navto('/pages/money/withdrawal')">立即提现</view>
 	</view>
 </template>
 
@@ -183,19 +184,7 @@ page {
 .content-money {
 	padding-bottom: 30rpx;
 	background: $page-color-base;
-	.moneyTx{
-		position: absolute;
-		top: 150rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #FFFFFF;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #FFFFFF;
-		line-height: 1;
-		font-size: $font-base;
-	}
+	
 	.buttom-box {
 		background-color: #ffffff;
 		text-align: center;
@@ -229,12 +218,22 @@ page {
 	height: 368rpx;
 	color: #ffffff;
 	text-align: center;
+  background-image: url(../../static/img/wallertbg.png);
+  background-size: 100%;
+
 	.text {
 		padding-top: 147rpx;
 		font-size: $font-sm;
 	}
 	.money {
+    padding-top: 147rpx;
 		font-size: 56rpx;
+    text {
+      display: inline-block;
+      font-size: 32rpx;
+      position: relative;
+      top: -5rpx;
+    }
 	}
 }
 
@@ -302,4 +301,18 @@ page {
 		background-color: #ffffff;
 	}
 }
+.moneyTx{
+    width: 674rpx;
+    height: 88rpx;
+    background: #901b21;
+    border-radius: 44rpx;
+    position: fixed;
+    left: 39rpx;
+    bottom: 51rpx;
+    text-align: center;
+    line-height: 88rpx;
+    font-size: 36rpx;
+    font-weight: 500;
+    color: #FFFFFF;
+	}
 </style>

pages/user/scoreAccumulate.vue

@@ -1,9 +1,12 @@
 <template>
 	<view class="content">
-		<!-- <view class="navbar">
+<!-- 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view> -->
 		<view class="top-wrapper">{{score||0.00}}</view>
+    <view class="navbar">
+    	<view v-for="(item,index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index}" @click="tabClick(index)">{{ item.text }}</view>
+    </view>
 		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
 				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
@@ -50,10 +53,18 @@ export default {
 			navList: [
 				{
 					state: 0,
-					text: '全部',
+					text: '收入',
 					loadingType: 'more',
 					orderList: [],
-					page: 1, //当前页数
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 1,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页面
 					limit: 10 //每次信息条数
 				},
 			],

pages/user/user.vue

@@ -11,11 +11,11 @@
 						<view class="info-box">
 							<view class="username">{{ userInfo.nickname || '游客' }}</view>
 							<!-- <view class="font-size-sm" v-if="userInfo.spread_uid">邀请码:{{ userInfo.spread_uid }}</view> -->
-							<view class="font-size-sm">{{'11111111111'|hiddenphone}}</view>
+							<view class="font-size-sm" v-if="userInfo.phone">{{userInfo.phone |hiddenphone}}</view>
 						</view>
 					</view>
 					<view class="config iconfont">
-						<text class="setting " @click="navTo('/pages/set/set')"><image src="../../static/img/set.png" mode=""></image></text>
+						<view class="setting " @click="navTo('/pages/set/set')"><image src="../../static/img/set.png" mode=""></image></view>
 						<!-- <text class="message iconmessage" @click="navTo('/pages/user/notice')"></text> -->
 					</view>
 				</view>
@@ -54,7 +54,7 @@
 					<view class="withdraw">
 						可提现 ￥<text class="withdraw-num">2689</text>
 					</view>
-					<view class="btn">
+					<view class="btn" @click="navTo('/pages/user/award')">
 						立刻提现
 					</view>
 				</view>
@@ -69,7 +69,7 @@
 						<text class="num">{{ userInfo.integral || '0.00' }}</text>
 					</view>
 					<!-- <view class="jg"></view> -->
-					<view class="tj-item" @click="navTo('/pages/user/award')">
+					<view class="tj-item" @click="navTo('/pages/user/extension')">
 						<text>我的推广</text>
 						<!-- <text>我的佣金</text> -->
 						<text class="num">{{ userInfo.brokerage_price || '0' }}</text>
@@ -102,9 +102,9 @@
 							<text class="iconfont iconenter"></text>
 						</view>
 					</view> -->
-					<view class="user-item">
+					<view class="user-item" @click="navTo('/pages/order/order?state=0&isUser='+isUser)">
 						<text>我的订单</text>
-						<text class="iconfont iconenter" @click="loadMore()"></text>
+						<text class="iconfont iconenter" ></text>
 					</view>
 					<view class="order-section">
 						<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover" :hover-stay-time="50">
@@ -162,11 +162,11 @@
 							<view class="icon"><image class="icon-img" src="/static/icon/u7.png" mode="aspectFit"></image></view>
 							<text>退货管理</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
+						<view class="order-item" @click="navTo('/pages/user/shareQrCode')" hover-class="common-hover" :hover-stay-time="50">
 							<view class="icon"><image class="icon-img" src="/static/icon/u1.png" mode="aspectFit"></image></view>
 							<text>推广海报</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
+						<view class="order-item" @click="navTo('/pages/set/address')" hover-class="common-hover" :hover-stay-time="50">
 							<view class="icon"><image class="icon-img" src="/static/icon/u2.png" mode="aspectFit"></image></view>
 							<text>收货地址</text>
 						</view>
@@ -233,7 +233,7 @@ import { mapState, mapMutations } from 'vuex';
 import uniList from '@/components/uni-list/uni-list.vue';
 import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import { orderData, userinfo } from '@/api/user.js';
+import { orderData, getUserInfo } from '@/api/user.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
 let startY = 0,
@@ -252,7 +252,8 @@ export default {
 			userDowm: 0, //卡片升级专属高度
 			userMaxDowm: 0 ,//卡片最高高度,
 			userIdentity: false,
-			text: 'ch125221'
+			text: 'ch125221',
+      isUser: 0
 		};
 	},
 	onShow() {
@@ -311,9 +312,10 @@ export default {
 		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
 		// 加载初始数据
 		loadBaseData() {
-			userinfo({})
+			getUserInfo({})
 				.then(({ data }) => {
-					this.setUserInfo(data);
+					this.setUserInfo(data);
+          console.log(data,'++++++++++++')
 					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
 					orderData({})
 						.then(({ data }) => {
@@ -395,6 +397,11 @@ export default {
 		},
 		changeIdentity() {
 			this.userIdentity = !this.userIdentity
+      if(this.isUser === 0){
+        this.isUser = 1
+      }else if(this.isUser === 1){
+        this.isUser = 0
+      }
 		},
 		showPopup() {
 			this.$refs.popup.open()

utils/request.js

@@ -12,7 +12,7 @@ service.interceptors.response(
 			// 解析字符串为数字
 			if (res.status !== 200) {
 				console.log(res.status);
-				console.log(res)
+				// console.log(res)
 				if (res.status == 410000) {
 					// 调用退出登录方法清空用户信息
 					store.commit('user/logout');