修改样式

api/api.js

@@ -46,13 +46,13 @@ export function api(key, data, callback, loadingTitle) {
 	}
 
 	//必须登录
-	// if (req.auth) {
-	// 	if (!uni.getStorageSync('token')) {
-	// 		utils.toLogin()
-	// 		console.error('需要登录')
-	// 		return
-	// 	}
-	// }
+	if (req.auth) {
+		if (!uni.getStorageSync('token')) {
+			utils.toLogin()
+			console.error('需要登录')
+			return
+		}
+	}
 	
 	// 接口防抖
 	if(req.debounce){

api/http.js

@@ -25,13 +25,13 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
 				uni.hideLoading();
 			}
 			
-			// if(res.statusCode == 401 || 
-			// res.data.message == '操作失败，token非法无效!' || 
-			// res.data.message == '操作失败，用户不存在!'){
-			// 	uni.removeStorageSync('token')
-			// 	console.error('登录过期');
-			// 	utils.toLogin()
-			// }
+			if(res.statusCode == 401 || 
+			res.data.message == '操作失败，token非法无效!' || 
+			res.data.message == '操作失败，用户不存在!'){
+				uni.removeStorageSync('token')
+				console.error('登录过期');
+				utils.toLogin()
+			}
 			
 			if(res.statusCode == 200 && res.data.code != 200
 			&& res.data.code != 902){

api/model/index.js

@@ -1,12 +1,10 @@
-
-
 // 首页相关接口
 
 const api = {
 	// 获取首页轮播图
 	getRiceBanner: {
 		url: '/index_common/getRiceBanner',
-		method: 'GET', 
+		method: 'GET',
 	},
 	// 获取首页常规产品【废弃】
 	// getRiceCommonProductList: {
@@ -16,32 +14,32 @@ const api = {
 	// 获取首页跳转图标
 	getRiceIconList: {
 		url: '/index_common/getRiceIconList',
-		method: 'GET', 
+		method: 'GET',
 	},
 	// 获取首页新闻详情
 	getRiceNewsDetail: {
 		url: '/index_common/getCommonNewsDetail',
-		method: 'GET', 
+		method: 'GET',
 	},
 	// 获取首页新闻列表
 	getRiceNewsList: {
 		url: '/index_common/getRiceNewsList',
-		method: 'GET', 
+		method: 'GET',
 	},
 	// 获取首页公告列表
 	getRiceNoticeList: {
 		url: '/index_common/getRiceNoticeList',
-		method: 'GET', 
+		method: 'GET',
 	},
 	// 获取首页商品详情
 	getRiceProductDetail: {
 		url: '/index_common/getRiceProductDetail',
-		method: 'GET', 
+		method: 'GET',
 	},
 	// 获取首页体验产品
 	getRiceProductList: {
 		url: '/index_common/getRiceProductList',
-		method: 'GET', 
+		method: 'GET',
 	},
 	// 查询分类接口
 	getCategoryList: {
@@ -57,62 +55,67 @@ const api = {
 	addCart: {
 		url: '/index_common/addCart',
 		method: 'GET',
-		auth : true,
-		showLoading : true,
+		auth: true,
+		showLoading: true,
 	},
 	// 删除购物车信息
 	deleteCart: {
 		url: '/index_common/deleteCart',
 		method: 'DELETE',
-		auth : true,
-		showLoading : true,
+		auth: true,
+		showLoading: true,
 	},
 	// 修改购物车信息数量
 	updateCartNum: {
 		url: '/index_common/updateCartNum',
 		method: 'POST',
-		auth : true,
-		debounce : 300,
+		auth: true,
+		debounce: 300,
 	},
 	// 创建订单
 	createOrder: {
 		url: '/index_common/createOrder',
 		method: 'GET',
-		auth : true,
-		limit : 1000,
-		showLoading : true,
+		auth: true,
+		limit: 1000,
+		showLoading: true,
 	},
 	// 创建订单-再次支付
 	createOrderTwo: {
 		url: '/index_common/createOrderTwo',
 		method: 'GET',
-		auth : true,
-		limit : 1000,
-		showLoading : true,
+		auth: true,
+		limit: 1000,
+		showLoading: true,
 	},
 	// 多商品创建订单
 	createSumOrder: {
 		url: '/index_common/createSumOrder',
 		method: 'POST',
-		auth : true,
-		limit : 1000,
-		showLoading : true,
+		auth: true,
+		limit: 1000,
+		showLoading: true,
 	},
 	// 多商品订单再次支付
 	createSumOrderAgain: {
 		url: '/index_common/createSumOrderAgain',
 		method: 'POST',
-		auth : true,
-		limit : 1000,
-		showLoading : true,
+		auth: true,
+		limit: 1000,
+		showLoading: true,
 	},
 	// 确认收货
 	confirmOrder: {
 		url: '/index_common/confirmOrder',
 		method: 'GET',
-		auth : true,
-		limit : 1000,
-		showLoading : true,
+		auth: true,
+		limit: 1000,
+		showLoading: true,
+	},
+	// 获取首页广告列表
+	getRiceProductList: {
+		url: '/index_common/getRiceAdList',
+		method: 'GET',
 	},
 }
 

components/product/productItem.vue

@@ -20,11 +20,10 @@
 					￥<text>{{ item.vipPrice }}/元每件</text>
 				</view>
 				<view class="price-imgs">
-					<image src="@/static/image/category/gold-card-price.png" mode="widthFix" class="price-img"></image>
-					<image v-if="false" src="@/static/image/category/silver-card-price.png" mode="widthFix"
-						class="price-img"></image>
-					<image v-if="false" src="@/static/image/category/diamond-price.png" mode="widthFix"
-						class="price-img"></image>
+					<image :src="configList.vip_money_one" mode="widthFix" class="price-img"></image>
+					<image v-if="false" :src="configList.vip_money_onevip_money_two" mode="widthFix" class="price-img">
+					</image>
+					<image v-if="false" :src="configList.vip_money_three" mode="widthFix" class="price-img"></image>
 				</view>
 			</view>
 

config.js

@@ -1,4 +1,3 @@
-
 import Vue from 'vue'
 import api from '@/api/api.js'
 import utils from './utils/utils.js'
@@ -12,30 +11,30 @@ const type = 'dev'
 
 // 环境配置
 const config = {
-	dev : {
-		baseUrl : 'http://h5.xzaiyp.top/jewelry-admin',
+	dev: {
+		baseUrl: 'http://h5.xzaiyp.top/jewelry-admin',
 	},
-	prod : {
-		baseUrl : 'https://jewelry-admin.hhlm1688.com/jewelry-admin',
+	prod: {
+		baseUrl: 'https://jewelry-admin.hhlm1688.com/jewelry-admin',
 	}
 }
 
 
 // 默认配置
 const defaultConfig = {
-	mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU',
-	aliOss : {
-		url : 'https://tennis-oss.xzaiyp.top/',
-		config : {
+	mapKey: 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU',
+	aliOss: {
+		url: 'https://image.hhlm1688.com/',
+		config: {
 			//桶的地址
 			region: 'oss-cn-guangzhou',
 			//id
-			accessKeyId:'LTAI5tNycA46YTwm383dRvMV',
+			accessKeyId: 'LTAI5tQSs47izVy8DLVdwUU9',
 			//密钥
-			accessKeySecret:'tAdbYQCmdur6jbZ8hjvgB7T1Z52mIG',
+			accessKeySecret: 'qHI7C3PaXYZySr84HTToviC71AYlFq',
 			//桶的名字
-			bucket: 'zhuoqiu-image',
-			endpoint:'oss-cn-guangzhou.aliyuncs.com',
+			bucket: 'hanhaiimage',
+			endpoint: 'oss-cn-shenzhen.aliyuncs.com',
 		}
 	},
 }

manifest.json

@@ -52,7 +52,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx0839bc52e7849c13",
+        "appid" : "wx28679cb649907e7e",
         "setting" : {
             "urlCheck" : false
         },

pages.json

@@ -48,9 +48,7 @@
 	},
 	"subPackages": [{
 		"root": "pages_order",
-		"pages": [{
-				"path": "mine/card"
-			},
+		"pages": [
 			{
 				"path": "mine/partner"
 			},

pages/index/category.vue

@@ -15,7 +15,7 @@
 				<view class="list">
 					<uv-vtabs-item>
 						<productItem v-for="(item, index) in list" :key="index" :item="item"
-							@click="$utils.navigateTo('/pages_order/mine/moreCommodity')" />
+							@click="$utils.navigateTo(`/pages_order/product/productDetail?id=${item.id}`)" />
 					</uv-vtabs-item>
 				</view>
 			</uv-vtabs>
@@ -23,7 +23,6 @@
 
 		<!-- tabbar -->
 		<tabber select="category" />
-
 	</view>
 </template>
 

pages/index/center.vue

@@ -12,7 +12,7 @@
 			<view class="user-info">
 				<view class="user-base-info">
 					<view class="user-base-top">
-						<view class="user-name">倾心.临时决定离开军队费时费力士大夫</view>
+						<view class="user-name">{{ userInfo.nickName}}</view>
 						<view class="member-level">
 							<image src="@/static/image/center/diamond-min.png" mode="widthFix" class="level"></image>
 							<image v-if="false" src="@/static/image/center/gold-min.png" mode="widthFix" class="level">
@@ -62,7 +62,7 @@
 		<!-- 佣金数据 -->
 		<view class="brokerage-data">
 			<view class="brokerage">
-				<image src="@/static/image/center/brokerage.png" mode="widthFix" class="brokerage-img"></image>
+				<image :src="configList.money_image" mode="widthFix" class="brokerage-img"></image>
 
 				<div class="main">
 					<div class="title">我的佣金</div>
@@ -71,7 +71,7 @@
 			</view>
 
 			<view class="balance">
-				<image src="@/static/image/center/balance.png" mode="widthFix" class="balance-img"></image>
+				<image :src="configList.price_image" mode="widthFix" class="balance-img"></image>
 
 				<div class="main">
 					<div class="title">我的余额</div>
@@ -99,7 +99,7 @@
 					<image src="@/static/image/center/3.png" mode="widthFix" />
 					<view class="title">联系客服</view>
 				</view>
-				<view class="boxs" @click="$utils.navigateTo('/pages/index/order?type=4')">
+				<view class="boxs" @click="$utils.navigateTo('/pages_order/mine/promotion')">
 					<image src="@/static/image/center/4.png" mode="widthFix" />
 					<view class="title">邀请好友</view>
 				</view>
@@ -118,7 +118,7 @@
 					<image src="@/static/image/center/7.png" mode="widthFix" />
 					<view class="title">优惠券</view>
 				</view>
-				<view class="boxs" @click="$utils.navigateTo('/pages/index/order?type=4')">
+				<view class="boxs" @click="$utils.navigateTo('/pages_order/mine/help')">
 					<image src="@/static/image/center/8.png" mode="widthFix" />
 					<view class="title">帮助与反馈</view>
 				</view>
@@ -155,13 +155,14 @@
 		mapState
 	} from 'vuex'
 	import customerServicePopup from '@/components/config/customerServicePopup.vue'
+	
 	export default {
 		components: {
 			tabber,
 			customerServicePopup,
 		},
 		computed: {
-			...mapState(['userInfo', 'riceInfo']),
+			...mapState(['userInfo', 'riceInfo','configList']),
 		},
 		data() {
 			return {

pages/index/index.vue

@@ -46,8 +46,8 @@
 				<view class="red-packet">
 					<image src="@/static/image/home/red-packet.png" mode="widthFix"></image>
 				</view>
-				<view v-for="item in 4" :key="item" class="activity">
-					<image src="@/static/image/home/necklace.png" mode="widthFix"></image>
+				<view v-for="item in adList" :key="item.id" class="activity">
+					<image :src="item.icon" mode="widthFix"></image>
 					<image src="@/static/image/home/exclusive.png" mode="widthFix"></image>
 					<view class="product-price">
 						￥100
@@ -63,7 +63,7 @@
 		</view>
 		<view class="video-list">
 			<scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll">
-				<view v-for="item in 10" class="video-item">
+				<view v-for="item in 10" :key="item" class="video-item">
 					<video src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/2minute-demo.mp4"
 						@error="videoErrorCallback" :danmu-list="danmuList" controls class="product-video"></video>
 				</view>
@@ -89,7 +89,7 @@
 
 		<!-- tabbar -->
 		<tabber select="home" />
-		
+
 		<!-- 优惠券弹窗 -->
 		<couponPopup v-model="showCouponPopup" @examine="toCoupon"></couponPopup>
 	</view>
@@ -126,7 +126,8 @@
 				riceProductList: [], //体验产品
 				newList: [], //新闻列表
 				mixinsListApi: 'getClassShophomeList',
-				showCouponPopup : true
+				showCouponPopup: true,
+				adList : []
 			}
 		},
 		computed: {},
@@ -139,6 +140,7 @@
 			this.getBanner()
 			this.getRiceNoticeList()
 			this.getRiceIconList()
+			this.getRiceAdList()
 			// this.getRiceCommonProductList()
 		},
 		onPullDownRefresh() {
@@ -204,7 +206,16 @@
 			getRiceIconList() {
 				this.$api('getRiceIconList', res => {
 					if (res.code == 200) {
-						this.baseList = res.result.slice(0, 5)
+						this.baseList = res.result
+					}
+				})
+			},
+
+			//获取首页广告
+			getRiceAdList() {
+				this.$api('getRiceProductList', res => {
+					if (res.code == 200) {
+						this.adList = res.result.records
 					}
 				})
 			},
@@ -240,11 +251,11 @@
 			scroll: function(e) {
 
 			},
-			
+
 			//跳转优惠券页面
 			toCoupon() {
 				uni.navigateTo({
-					url: "/pages_order/mine/withdraw"
+					url: "/pages_order/mine/coupon"
 				})
 			}
 		},
@@ -374,6 +385,7 @@
 			padding: 20rpx;
 			background: white;
 			font-size: 34rpx;
+
 			.line {
 				height: 40rpx;
 				width: 10rpx;
@@ -382,7 +394,7 @@
 				margin-right: 10rpx;
 			}
 		}
-		
+
 		.video-list {
 			.scroll-view_H {
 				white-space: nowrap;
@@ -409,11 +421,11 @@
 			background: white;
 			margin: 20rpx 0rpx;
 			padding: 20rpx;
-			
+
 			.recommend-title {
 				font-size: 36rpx;
 			}
-			
+
 			.recommend-more {
 				color: $uni-color;
 			}

pages_order/mine/balance.vue

@@ -8,15 +8,6 @@
 		
 		<view class="bg"/>
 		
-		<!-- <view class="price">
-			<view class="title">
-				我的余额（元）
-			</view>
-			<view class="num">
-				{{ riceInfo.balance || 0 }}
-			</view>
-		</view> -->
-		
 		<view class="cell">
 			<view class="cell-top">收支明细</view>
 			<view class="cell-box" 

pages_order/mine/card.vue

@@ -1,10 +1,10 @@
-<!-- 会员卡片页面 -->
+<!-- 会员卡片页面
 <template>
 	<view class="member-card">
-		<!-- 导航栏 -->
+		导航栏
 		<navbar title="会员" leftClick @leftClick="$utils.navigateBack" />
 
-		<!-- 会员列表 -->
+		会员列表
 		<view class="member-list">
 			<view v-for="item in memberList" :key="item.id" class="member-item">
 				<image :src="item.memberBg" mode="widthFix" class="member-image"></image>
@@ -22,7 +22,7 @@
 			</view>
 		</view>
 
-		<!-- 小会员列表 -->
+		小会员列表
 		<view class="member-list-min">
 			<image v-for="item in minMemberList" :key="item.id" :src="item.icon" mode="heightFix" class="member-icon"></image>
 		</view>
@@ -138,4 +138,4 @@
 			}
 		}
 	}
-</style>
+</style> -->

pages_order/mine/memberCenter.vue

@@ -47,7 +47,7 @@
 
 		<!-- 会员权益 -->
 		<view class="member-equity-title">
-			<image src="@/pages_order/static/memberCenter/equity.png" mode="widthFix" class="eqyity-img"></image>
+			<image :src="configList.vip_qy_image" mode="widthFix" class="eqyity-img"></image>
 		</view>
 		<view class="equity-card-list">
 			<view v-for="(item,index) in equityList" :key="item.id" class="equity-card">

pages_order/mine/promotion.vue

@@ -1,24 +1,12 @@
 <template>
 	<view class="promotion">
 		
-		
 		<navbar title="二维码" 
-		bgColor="#A3D250"
+		bgColor="#E3441A"
 		color="#fff"
 		leftClick @leftClick="$utils.navigateBack" />
 		
 		<view class="promotion-card">
-			<!-- <view class="user-info"> -->
-			<!-- <image class="image" :src="userInfo.headImage" mode="widthFix"></image> -->
-			<!-- <image class="image" src="../../static/logo.png" mode="widthFix"></image> -->
-			<!-- <view class="user-name">{{ userInfo.nickName }}</view> -->
-			<!-- <view class="user-name">湖南第一深情</view> -->
-			<!-- </view> -->
-			<!-- <view class="invitation-code-img">
-				<image 
-				style="width: 400rpx;"
-				:src="imagePath" mode="widthFix"></image>
-			</view> -->
 			
 			<image :src="userInfo.headImage" mode="aspectFill"
 			class="headImage"></image>
@@ -44,8 +32,8 @@
 		data() {
 			return {
 				url: '',
-				title: '123123',
-				baseUrl: 'https://dianpin-img.xzaiyp.top/',
+				title: '',
+				baseUrl: 'https://image.hhlm1688.com/',
 				canvas: {},
 				imagePath: '',
 			}

pages_order/mine/withdraw.vue

@@ -5,7 +5,7 @@
 
 		<!-- 佣金信息 -->
 		<view class="b-relative center font-m">
-			<image src="@/pages_order/static/withdraw/cz.png" />
+			<image :src="configList.tx_image" />
 
 			<view class="user-money">
 				<view class="title">总佣金</view>
@@ -29,20 +29,17 @@
 
 		<!-- 我要提现 -->
 		<view class="from-body">
-			<view>我要提现</view>
+			<view class="title">我要提现</view>
 
 			<view class="money">
-				<van-cell-group inset>
-					<van-field type="number" v-model="form.price" placeholder="请输入提现金额"
-						style="background-color: #F5F5F5; margin: 10rpx 0px; border-radius: 20px;" />
-					<van-field v-model="form.bank" placeholder="请输入开户行"
-						style="background-color: #F5F5F5; margin: 10rpx 0px; border-radius: 20px;" />
-					<van-field v-model="form.card" placeholder="请输入卡号"
-						style="background-color: #F5F5F5; margin: 10rpx 0px; border-radius: 20px;" />
-				</van-cell-group>
+				<uv-input placeholder="请输入提现金额" border="surround" v-model="form.money"></uv-input>
 			</view>
-
-			<view v-html="withdrawalStatement" class="withdrawal-statement"></view>
+		</view>
+		
+		<!-- 提现说明 -->
+		<view class="withdrawal-statement">
+			<view class="title">提现说明</view>
+			<view v-html="configList.recharge_instructions" class="withdrawal-statement"></view>
 		</view>
 
 		<view class="recharge">
@@ -67,9 +64,7 @@
 				type: ['+', '-'],
 				state: ['未到账', '已到账'],
 				form: {
-					money: '',
-					bankNo: '',
-					bankName: '',
+					money: ''
 				},
 			}
 		},
@@ -78,7 +73,6 @@
 		},
 		data() {
 			return {
-				withdrawalStatement: '', //充值说明
 				form: {
 					type: 1,
 					price: undefined,
@@ -237,18 +231,24 @@
 			text-align: left;
 			color: #333333;
 		}
+		
+		.from-body .title{
+			font-size: 36rpx;
+		}
 
 		.money {
 			margin: 20rpx 0rpx;
 		}
-
-		.money .van-cell-group--inset {
-			margin: 0;
-		}
-
-		.money .van-field {
-			padding: auto 0rpx;
-			margin-bottom: 30rpx !important;
+		
+		// 提现说明
+		.withdrawal-statement {
+			padding: 0rpx 20rpx;
+			box-sizing: border-box;
+			
+			.title {
+				font-size: 36rpx;
+				margin-bottom: 20rpx;
+			}
 		}
 
 		.recharge {

pages_order/order/createOrder.vue

@@ -33,8 +33,8 @@
 			<view @click="openAddress" class="cell-item">
 				<view class="cell-item-left">
 					<image src="@/pages_order/static/createOrder/address.png" mode="widthFix" class="cell-icon"></image>
-					<view class="user-name">李满和</view>
-					<view class="user-address">城南故事C3栋2802数据都是佛山佛挡杀佛</view>
+					<view class="user-name">{{ address.name }}</view>
+					<view class="user-address">{{ address.address}}</view>
 				</view>
 				<view class="cell-item-right">
 					<uv-icon name="arrow-right"></uv-icon>
@@ -48,7 +48,7 @@
 						<image src="@/pages_order/static/createOrder/account.png" mode="widthFix" class="cell-icon">
 						</image>
 						<view class="user-name">账户余额</view>
-						<view class="descript">(余额: 300)</view>
+						<view class="descript">(余额: {{ userInfo.money}})</view>
 					</view>
 					<view class="cell-item-right">
 
@@ -64,7 +64,7 @@
 						<view class="descript"></view>
 					</view>
 					<view class="cell-item-right">
-						
+
 					</view>
 				</view>
 			</view>
@@ -77,7 +77,7 @@
 					<view class="descript">$20</view>
 				</view>
 				<view class="cell-item-right">
-					
+
 				</view>
 			</view>
 
@@ -117,7 +117,7 @@
 
 <script>
 	import addressList from '../components/address/addressList.vue'
-	
+
 	import {
 		mapState
 	} from 'vuex'
@@ -384,7 +384,7 @@
 						padding-left: 20rpx;
 						box-sizing: border-box;
 					}
-					
+
 					.descript {
 						color: #888888;
 					}
@@ -433,7 +433,7 @@
 					color: $uni-color;
 				}
 			}
-			
+
 			// 下单
 			.submit {
 				position: fixed;
@@ -445,12 +445,12 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-			
+
 				.price {
 					color: #F39637;
 					padding: 0 20px;
 				}
-			
+
 				.btn {
 					background: $uni-color;
 					color: white;