修复使用优惠劵

App.vue

@@ -1,5 +1,6 @@
 <script>
 	import {defaultRequest,defaultRequest4} from 'api/index.js'
+	
 	export default {
 		data(){
 			return {
@@ -8,6 +9,16 @@
 		},
 		onLaunch: function() {
 			// console.log('App Launch')
+			uni.onTabBarMidButtonTap(()=>{
+					console.log("点击了")
+			        // 这里可以根据 个人需求 做点击处理，
+			        // 本人需进行页面跳转。
+					uni.navigateTo({
+						url:"../index/index2",
+						animationType:'slide-in-bottom'
+					})
+				})
+			
 		setTimeout(() => {
 						plus.navigator.closeSplashscreen();
 					}, 5000);

common/common.scss

@@ -445,7 +445,7 @@
 			}
 			.recommend_content_item_pric{
 				font-size: 32rpx;
-				font-weight: bold;
+				// font-weight: bold;
 				margin-top: 6rpx;
 			}
 		}
@@ -457,6 +457,7 @@
 	background-color: #FEF6F4;
 	height: 186.67rpx;
 	color: #F66C46;
+	margin-top: 11rpx;
 	margin-bottom: 25.33rpx;
 	.coupons_item_left{
 		width: 216.67rpx;
@@ -598,7 +599,7 @@
 			margin-bottom: 56rpx;
 		}
 		.tips{
-			color: #DA0303;
+			color: #630201;
 			font-size: 18.67rpx;
 			font-weight: bold;
 		}
@@ -613,8 +614,9 @@
 			width: 100%;
 			height: 88rpx;
 			line-height: 88rpx;
-			background-color: #000000;
+			background: rgba(0,0,0,0.6);
-			color: white;
+		 background-color: #630102 !important;
+			color: white !important;
 			// background-color: #e7e7e7;
 			// color: #666666;
 			margin-top: 30rpx;
@@ -623,7 +625,7 @@
 			font-weight: bold;
 		}
 		.login_submit1{
-			background-color: #000000;
+			// background-color: #000000;
 			color: white;
 		}
 		.agreement{

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "Dope Plus",
+    "name" : "DopePlus",
     "appid" : "__UNI__A6CF3EA",
     "description" : "",
     "versionName" : "1.0.0",
@@ -55,7 +55,8 @@
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "autoSdkPermissions" : true
+                "autoSdkPermissions" : true,
+                "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {

pages.json

@@ -344,6 +344,15 @@
                 "enablePullDownRefresh": false
             }
             
+        },
+		{
+		    "path" : "pages/specialTitle/index2",
+		    "style" :                                                                                    
+		    {
+		        "navigationStyle":"custom",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		}
     ],
 	"globalStyle": {

pages/account/demo1.vue

@@ -1,399 +1,437 @@
 <template>
-	<view>
+	<view class="u-wrap">
-		
+		<view class="search">
-	</view>
+			<view class="status_bar"></view>
-</template>
+			<view class="search1">
-
+				<navigator url="/pages/index/search">
-<script>
+					<view class="navigation_seach">
-	
+							<image src="../../static/img/seach.png" mode=""></image>
-</script>
+							<text>search</text>
-
-<style>
-</style><template>
-	<view>
-		<uni-nav-bar  :statusBar="true" left-icon="left"   title="Review" color="#000000"   :fixed="true" @clickLeft="back">
-			<block slot="right">
-				<view class="nav_right">
-					<button @click="reviewSub">Submit</button>
-				</view>
-			</block>
-		</uni-nav-bar>
-		<view class="body" >
-			<view class="order_popup_commodity">
-				<view class="good_info" >
-					<view class="good_info_left ">
-						<view class="good_info_image">
-							<image ></image>
-						</view>
-						<view class="left_info">
-							<view class="info_name">9</view>
-							<view class="left_info_bottom">
-								<view class="info_lable">
-									<text>{{}}</text>
-									<!-- <image src="/static/img/bottom.png" mode=""></image> -->
-								</view>
-							</view>
 					</view>
+				</navigator>
+				<view class="navigation_title_right">
+					<navigator url="/pages/account/wishlist">
+						<image src="../../static/img/like_white.png" mode=""></image>
+					</navigator>
+					<navigator url="/pages/shippingCart/index" open-type="switchTab">
+						<uni-badge :text="sum" type="error" absolute="rightTop">
+							<image src="../../static/img/shop_cart1.png" mode=""></image>
+						</uni-badge>  
+					</navigator>
 				</view>
 			</view>
+			
 		</view>
-			<view class="review">
+		<view class="u-menu-wrap">
-				<view class="review_title">
+			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view category_left" :scroll-top="scrollTop"
-					<text>Score</text>
+			 :scroll-into-view="itemId">
-					<uni-rate size="22"  disabledColor="#B22234" v-model="query.comment_rank"  active-color="#B22234" :is-fill="false" class="rate" v-if="reviewType==0"/>
+				<view v-for="(item,index) in 7" :key="index" class="u-tab-item" :class="[current == index ? 'u-tab-item-active' : '']"
-					<uni-rate size="22"  disabledColor="#B22234" v-model="query1.comments[index].comment_rank"  active-color="#B22234" :is-fill="false" class="rate" v-else/>
+				 @tap.stop="swichMenu(index)">
+					<text class="u-line-1">可乐</text>
 				</view>
-				<view class="review_content">
+			</scroll-view>
-					<image src="../../static/img/write.png" mode=""></image>
+			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll">
-					<textarea placeholder="Write reviews" v-if="reviewType==0" v-model="query.comment"></textarea>
+				<view class="page-view">
-					<textarea placeholder="Write reviews" v-else v-model="query1.comments[index].comment"></textarea>
+					<view class="class-item" :id="'item' + index" v-for="(item , index) in 7" :key="index">
+						<view class="item-title">
+							<text>奶茶</text>
 						</view>
-				<view class="reason_upload">
+						<view class="good_content">
-					<view class="reason_upload_item" @click="UploadVideo">
+							<view class="good_item" v-for="(item1, index1) in 6" :key="index1">
-						<image src="/static/img/vedio.png" class="upload_item_camera1" mode=""v-if="!VideoSrc"></image>
+								<view @click="toDetial(item1)">
-						<image :src="VideoSrc" class="upload_item_camera" mode="" v-else></image>
+									<view class="good_item_img"><image src="" alt=""></view>
-						<view>Upload the video</view>
 								</view>
-					<view class="reason_upload_item"  @click="upload()">
+								<text>肯德基</text>
-						<!-- <image src="/static/img/camera.png" class="upload_item_camera" mode="" v-if="!imgSrc"></image>
-						<image :src="imgSrc" class="upload_item_camera" mode="" v-else></image>
 								
-						<view>Upload pictures</view> -->
-						<text ref="input" class="upFile" @click="upload()"></text>
 							</view>
-					
-					<view class="reason_upload_item reason_upload_item1">
-						<!-- <image :src="" class="upload_item_image" mode=""></image> -->
 						</view>
-					
 					</view>
-				<view class="reason_upload_tips">Upload JPG, PNG format, within 3M</view>
 				</view>
-			
+			</scroll-view>
 		</view>
 	</view>
 </template>
-
+<script>
-<script module="test" lang="renderjs" >
+	import {defaultRequest,defaultRequest4} from '../../api/index.js'
-	export default {
-			mounted() {
-				// ...
-			},
-			methods: {
-			upload(){
-				console.log(1111)
-			    var input = document.createElement('input');
-			    input.type = 'file'; 
-			    input.accept='image/*';
-			    this.$refs.input.$el.appendChild(input);
-			    input.onchange = (event) => {  
-			        this.fileName = event.path[0].files[0].name;
-			    }  
-			    $('input').click();
-			},
-			}
-		}
-	
-</script>
-<script >
-	import {defaultRequest,defaultRequest2,defaultRequest3} from '../../api/index.js'
-	import { encryptDes, decryptDes ,encrypt_by_des } from '@/utils/des.js' 
-	import Base64 from 'base-64';
-	import cryptoJS from "crypto-js"
-	import { pathToBase64 } from '@/js_sdk/mmmm-image-tools/index.js' 
 	export default {
 		data() {
 			return {
-				orderDate:{},
+				scrollTop: 0, //tab标题的滚动条位置
-				// 评论状态 0、单个评论 1批量评论
+				oldScrollTop: 0,
-				reviewType:0,
+				current: 0, // 预设当前项的值
-				query:{
+				menuHeight: 0, // 左边菜单的高度
-					_action:'commentordergoods',
+				menuItemHeight: 0, // 左边菜单item的高度
-					order_id:'',
+				itemId: '', // 栏目右边scroll-view用于滚动的id
-					order_sn:'',
+				tabbar: [],
-					rec_id:'',
+				menuItemPos: [],
-					goods_id:'',
+				arr: [],
-					comment:'',
+				scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
-					comment_rank:'',
+				timer: null, // 定时器
-					commentlabels:''
+				 categoryList:'1234567’',
+				sum:0,
+				backButtonPress:0,
+				homeIndex: 0
+			}
 		},
-				query1:{
+		onShow() {
-					_action:'commentorder',
+			this.sum =0
-					order_id:'',
+			this.getList()
-					order_sn:'',
+			
-					comments:[]
+			
+			uni.showTabBar()
 		},
-				VideoSrc:'',
+		onLoad() {
-				imgSrc:''
+			this.getList()
-			}
+			
 		},
-		methods:{
+		onReady() {
-			// 提交评论内容
+			this.getMenuItemTop()
-			reviewSub(){
-				let data
-				if(this.reviewType==0){
-					this.commentordergoods()
-				}else{
-					// data=this.query1
-					this.commentordergoods1()
-				}
-				console.info(data)
 		},
-			// 单个评论内容
+		// onBackPress(options) {
-			commentordergoods(){
+		// 	this.backButtonPress++;
-				defaultRequest2(this.query).then(res=>{
+		// 	if (this.backButtonPress > 1) { 
-					console.info(res)
+		// 		plus.runtime.quit();
-					if(res.error==0){
+		// 	} else {
-						uni.showToast({
+		// 		plus.nativeUI.toast('Click again to exit');
-							icon:'none',
+		// 	} 
-							title:'Comment successful!'
+		// 	setTimeout(function() {
-						})
+		// 		this.backButtonPress = 0;
-						setTimeout(function(){
+		// 	}, 1000);
-							uni.navigateBack()
+		// 	return true;
-						},2000)
+		// 			},
+    
+		methods: {
+      
+		
+			// 点击左边的栏目切换
+			async swichMenu(index) {
+				if(this.arr.length == 0) {
+					await this.getMenuItemTop();
 				}
-				})
+				if ( this.current === index) return;
+				
+				// this.scrollRightTop = this.oldScrollTop;
+				this.scrollRightTop = this.arr[index];
+				// this.$nextTick(function(){
+					// this.scrollRightTop = this.arr[index];
+				    this.current = index;
+					// this.leftMenuStatus(index);
+					
+				// })
 			},
-			// 批量评论内容
+			
-			commentordergoods1(){
+			toDetial(item){
-				defaultRequest2(this.query1,'comments').then(res=>{
+				console.log(item)
-					console.info(res)
+				
-					if(res.error==0){
-						uni.showToast({
-							icon:'none',
-							title:'Comment successful!'
-						})
-						setTimeout(function(){
-							uni.navigateBack()
-						},2000)
-					}
-				})
 			},
+			getList(){
 				
-			back(){
-				uni.navigateBack()
 			},
-			// 上传视频
+			// 获取一个目标元素的高度
-			UploadVideo(){
+			getElRect(elClass, dataVal) {
-				var that = this
+				new Promise((resolve, reject) => {
-				uni.chooseVideo({
+					const query = uni.createSelectorQuery().in(this);
-					sourceType: ['camera', 'album'],
+					query.select('.' + elClass).fields({
-					success: function (res) {
+						size: true
-						console.log(res)
+					}, res => {
-					 that.VideoSrc = res.tempFilePath;
+						// 如果节点尚未生成，res值为null，循环调用执行
-									}
+						if (!res) {
+							setTimeout(() => {
+								this.getElRect(elClass);
+							}, 10);
+							return;
+						}
+						this[dataVal] = res.height;
+						resolve();
+					}).exec();
 				})
 			},
+			// 观测元素相交状态
+			async observer() {
+				this.tabbar.map((val, index) => {
+					let observer = uni.createIntersectionObserver(this);
+					// 检测右边scroll-view的id为itemxx的元素与right-box的相交状态
+					// 如果跟.right-box底部相交，就动态设置左边栏目的活动状态
+					observer.relativeTo('.right-box', {
+						top: 0
+					}).observe('#item' + index, res => {
 						
-			// 上传图片
+						if (res.intersectionRatio > 0) {
-			Upimg(){
+							let id = res.id.substring(4);
-				let url
+							this.leftMenuStatus(id);
-				uni.chooseImage({
+						}
-					count: 3, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album'], //从相册选择
-					success: function (res) {
-						console.info(res)
-						console.log(JSON.stringify(res.tempFilePaths));
-						 const tempFilePaths = res.tempFiles[0]
-						 console.log(res)
-						let data ={
-							_action:'uploadcommentfile',
-							atype: 1,
-							afile:res.tempFiles
-						}
-						console.log(data)
-						defaultRequest(data).then(res =>{
-							console.log(res)
 					})
-						console.log(data)
-						defaultRequest(data).then(res =>{
-							console.log(res)
 				})
-						// uni.uploadFile({
+			},
-						// 	url:'https://v2.alapi.cn/api/image',
+			// 设置左边菜单的滚动状态
-						// 	filePath: res.tempFilePaths[0],
+			async leftMenuStatus(index) {
-						// 	name:'file',
+				 
-						// 	success: (uploadFileRes) => {
+				 
-						// 		var that = this	
+				 // console.log(index,'index')
-						// 		// uploadFileRes.data = decryptDes(uploadFileRes.data,"6780f04cf2e211ec86a8005056c00008")
+				 if (index == this.current) return;
-						// 		console.log(uploadFileRes)
+				this.current = index
-						// 	}
+				// 如果为0，意味着尚未初始化
+				if (this.menuHeight == 0 || this.menuItemHeight == 0) {
+					await this.getElRect('menu-scroll-view', 'menuHeight');
+					await this.getElRect('u-tab-item', 'menuItemHeight');
 					
-						// })
-						uni.getImageInfo({
-						src: res.tempFilePaths[0],
-						success: (path) => {
-							pathToBase64(path.path).then(base64 => {
-								   console.log(base64); // 这就是转为base64格式的图片
-								    url = base64
-							})
-							.catch(error => {
-								console.error(error)
-							})
 				}
+				// 将菜单活动item垂直居中
+				this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
+			},
+			// 获取右边菜单每个item到顶部的距离
+			getMenuItemTop() {
+				new Promise(resolve => {
+					let selectorQuery = uni.createSelectorQuery();
+					selectorQuery.selectAll('.class-item').boundingClientRect((rects) => {
+						// 如果节点尚未生成，rects值为[](因为用selectAll，所以返回的是数组)，循环调用执行
+						if(!rects.length) {
+							setTimeout(() => {
+								this.getMenuItemTop();
+							}, 10);
+							return ;
+						}
+						rects.forEach((rect) => {
+							// 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
+							this.arr.push(rect.top - rects[0].top);
+							resolve();
 						})
-						// uni.request({
+					}).exec()
-						// 	url:'https://v2.alapi.cn/api/image',
+				})
-						// 	method:'POST',
+			},
-						// 	data:{
+			// 右边菜单滚动
-						// 		image:url
+			async rightScroll(e) {
-						// 	},
+				// this.current = 0
-						// 	success(res) {
+				this.oldScrollTop = e.detail.scrollTop;
-						// 		console.log(res)
+				// if(this.arr.length == 0) {
+				// 	await this.getMenuItemTop();
 				// }
-						// })
+				
+				if(this.timer) return ;
+				if(!this.menuHeight) {
+					await this.getElRect('menu-scroll-view', 'menuHeight');
+				}
+				setTimeout(() => { // 节流
+					this.timer = null;
+					// scrollHeight为右边菜单垂直中点位置
+					let scrollHeight = e.detail.scrollTop + this.menuHeight / this.categoryList.length;
+					for (let i = 0; i < this.arr.length; i++) {
+						let height1 = this.arr[i];
+						let height2 = this.arr[i + 1];
+						// this.scrollRightTop = this.arr[i];
+						// 如果不存在height2，意味着数据循环已经到了最后一个，设置左边菜单为最后一项即可
+						if (!height2 || scrollHeight >=height1 && scrollHeight < height2) {
+							
+							this.leftMenuStatus(i);
+							
+							return ;
 						}
-				});
+						
 					}
-		},
+				}, 10)
-		onLoad(e) {
-			let datas=JSON.parse(e.data)
-			this.orderDate=datas
-			if(datas.order_goods.length>1){
-				this.reviewType=1
-				this.query1.order_id=datas.order_id
-				this.query1.order_sn=datas.order_sn
-				datas.order_goods.map(item=>{
-					let data={
-						rec_id:item.rec_id,
-						goods_id:item.goods_id,
-						comment:'',
-						comment_rank:'',
-						commentlabels:item.goods_attr.replace(/\s\n/g,' ')
-					}
-					this.query1.comments.push(data)
-				})
-			}else{
-				this.query.order_id=datas.order_id
-				this.query.order_sn=datas.order_sn
-				this.query.rec_id=datas.order_goods[0].rec_id
-				this.query.goods_id=datas.order_goods[0].goods_id
-				this.commentlabels=datas.order_goods[0].goods_attr.replace(/\s\n/g,' ')
-			}
-		},
-		filters:{
-			goodsAttr(e){
-				return e.replace(/\s\n/g,';');
 			}
 		}
 	}
 </script>
 
-
 <style lang="scss" scoped>
-	.review{
+	.u-wrap {
-		padding: 0 26rpx;
+		height: calc(100vh);
-		padding-top: 35.33rpx;
+		/* #ifdef H5 */
+		height: calc(100vh - var(--window-top));
+		/* #endif */
+		display: flex;
+		flex-direction: column;
+	}
+	.search{
+		width: 100%;
+		background-color:#000;
+		box-sizing: border-box;
+		padding: 33.33rpx 26.67rpx;
+		
+		position: fixed;
+		top: 0;
+		z-index: 99;
+	   // border-bottom: 1px solid #F5F6FA;
 		
-		.review_title{
+		.search1{
 			display: flex;
 			align-items: center;
-			font-weight: bold;
+			justify-content: space-between;
-			font-size: 32rpx;
+			
-			margin-bottom: 44rpx;
+			.navigation_seach{
-			.rate{
+				width: 546.67rpx;
-				margin-left: 24.67rpx;
+				background-color: #F5F6FA;
-			}
+				border-radius: 6.67rpx;
-		}
+				height: 66.67rpx;
-		.review_content{
 				display: flex;
+				align-items: center;
+				color: #8F9094;
+				border-radius: 33rpx;
+				font-size: 26.67rpx;
+				padding-left: 25rpx;
+				box-sizing: border-box;
+				
 				image{
 					width: 29.33rpx;
 					height: 29.33rpx;
-			}
+					margin-right: 22rpx;
-			textarea{
-				font-size: 28rpx;
-				font-weight: 400;
-				width: 100%;
-				height: 113.33rpx;
-				margin-left: 4rpx;
 				}
 			}
-		.reason_upload{
+			.navigation_title_right{
 				display: flex;
-			flex-wrap: wrap;
-			margin-bottom: 34.67rpx;
-			.reason_upload_item{
-				border: 1px dashed #D2D2D2;
-				border-radius: 15rpx;
-				width: 156rpx;
-				height: 156rpx;
-				display: flex;
-				justify-content: center;
 				align-items: center;
-				flex-direction: column;
-				font-size: 12rpx;
-				color: #BFBCBC;
-				margin-right: 23.33rpx;
 				
-				&:nth-child(3n+3){
+				image{
-					margin-right: 0;
+					width: 44rpx;
+					height: 44rpx;
+				}
+				>uni-navigator:first-child{
+					margin-right: 32.67rpx;
 				}
-				.upload_item_camera{
-					width: 72rpx;
-					height: 54.67rpx;
-					margin-bottom: 14rpx;
 			}
-				.upload_item_camera1{
-					width: 72rpx;
-					height: 72rpx;
-					// margin-bottom: 14rpx;
 			
 		}
-				.upload_item_image{
+		
-					width: 100%;
+	}
+
+  .u-menu-wrap {
+  	flex: 1;
 	height: 100%;
-					border-radius: 15rpx;
+  	display: flex;
+  	overflow: hidden;
+	margin-top: 166rpx;
   }
+  .category_left{
+  	height: 100%;
+  	// background-color: #F5F6FA;
+  	width: 197.33rpx;
+	
 	}
-			.reason_upload_item1{
+
+	.u-tab-view {
+		width: 200rpx;
+		height: 100%;
+	}
+
+	.u-tab-item {
+		width: 197.33rpx;
+		padding: 0 18rpx;
+		height: 94rpx;
+		font-size: 28.67rpx;
+		font-weight: bold;
+		
+		box-sizing: border-box;
+		font-family: PingFang SC;
+		
+		display: flex;
+		align-items: center;
+		word-wrap: break-word;
+		word-break: break-all;
+	}
+
+	.u-tab-item-active {
 		position: relative;
-				&::after{
+		font-size: 26rpx;
+		font-weight: 600;
+		background-color: black;
+		color: white;
+	}
+
+	.u-tab-item-active::before {
 		content: "";
-					width: 30.67rpx;
-					height: 30.67rpx;
 		position: absolute;
-					right: -12rpx;
+		
-					top: -12rpx;
+		height: 32rpx;
-					z-index: 99;
+		left: 0;
-					background-image: url("@/static/img/close3.png");
+		top: 39rpx;
-					background-size: 100% 100%;
 	}
+
+	.u-tab-view {
+		height: 100%;
 	}
+
+	.right-box {
+		background-color: rgb(250, 250, 250);
 	}
-		.reason_upload_tips{
+
-			font-size: 20rpx;
+	.page-view {
-			color: #666666;
+		padding: 16rpx;
 	}
+
+	.class-item {
+		margin-bottom: 30rpx;
+		background-color: #fff;
+		padding: 16rpx;
+		border-radius: 8rpx;
 	}
-	.uni-navbar{
+
-		font-size: 32rpx;
+	.class-item:last-child {
-		font-weight: bold;
+		min-height: 100vh;
 	}
-	.nav_right{
 
+	.item-title {
+		font-size: 26rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+	}
 
-		button{
+	.item-menu-name {
-			width: 116.67rpx;
+		font-weight: normal;
-			height: 48rpx;
-			background-color: black;
-			margin: 0;
-			line-height: 48rpx;
-			border-radius: 24rpx;
 		font-size: 24rpx;
-			font-weight: bold;
+		
-			color: white;
+	}
-			padding-left: 0;
+
-			padding-right: 0;
+	.item-container {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.thumb-box {
+		// width: 33.333333%;
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		margin-top: 20rpx;
 	}
+
+	.item-menu-image {
+		width: 120rpx;
+		height: 120rpx;
 	}
-	.body{
+	.good_content{
-		border-top: 14.67rpx #F6F5FA solid;
+		display: flex;
+		flex-wrap: wrap;
+		
+		.good_item{
+			font-size: 22.67rpx;
+			text-align: center;
+			margin-right: 25.33rpx;
+			margin-bottom: 51.33rpx;
+			
+			.good_item_img{
+				display: block;
+				background-color: #999999;
+				width: 146.67rpx;
+				height: 146.67rpx;
+				margin-bottom: 22rpx;
+				
+			}
+		}
+		.good_item:nth-child(3n+3){
+			margin-right: 0;
+		}
+	}
+	.good_item_img{
+		height: 100rpx;
+		width: 100rpx;
+		
+		image{
+			height: 100%;
+			width: 100%;
 		}
-	.order_popup_commodity{
-		padding: 0 33.33rpx;
-		border-bottom: 14.67rpx #F6F5FA solid;
 	}
 	
 </style>

pages/account/index.vue

@@ -62,10 +62,10 @@
 		<view class="order">
 			<view class="order_title">My Service</view>
 			<view class="order_info" >
-				<navigator v-for="(item,index) in indexDate.blocks" :key="item.block_title" @click="gotopage(item.block_title,item.block_link)" class="order_info_item">
+				<view v-for="(item,index) in indexDate.blocks" :key="item.block_title" @click="gotopage(item.block_title,item.block_link)" class="order_info_item" >
 					<image :src="item.block_pic" class="info_img" mode=""></image>
 					<text>{{ item.block_title }}</text>
-				</navigator>
+				</view>
 				<!-- <navigator :url="noLogin==0?'/pages/account/myReview':'../login/index'" class="order_info_item">
 					<image src="../../static/img/My Review.png" class="info_img" mode=""></image>
 					<text>My Review</text>
@@ -117,6 +117,7 @@
 			
 			
 		</view>
+		
 	</view>
 </template>
 
@@ -128,6 +129,7 @@
 				user_info:{
 					isLogin:false,
 				},
+				
 				// 获取该分类的其他商品的请求参数
 				catQuery:{
 					_action:'getgoods',
@@ -165,12 +167,15 @@
 				})
 			},
 			gotopage(title,url){
-				
+				var a,s
-				const a = url.indexOf('?')
+				if(url.indexOf('?'))
+				{
+					 a = url.indexOf('?')
 					console.log(a)
-				const s = url.substring(17);
+					s = url.substring(17);
-				console.log(title)
+				}
-				console.log(url)
+				// console.log(title)
+				// console.log(url)
 			   if(this.isLogin == 1 &&url==''){
 				   if(title.includes('Setting')){
 				         uni.navigateTo({
@@ -215,7 +220,7 @@
 				this.isLogin = uni.getStorageSync('isLogin')
 				let data={_action:'getuserbonus'}
 				defaultRequest(data).then(res=>{
-					console.info(res,)
+					console.info(res)
 				
 					
 				})
@@ -224,11 +229,12 @@
 				}).then(res =>{
 					console.log(res)
 					if(res.error ==0){
-						this.count = res.data.user_info.rank_points
+						this.count = res.data.user_info.user_money
 						this.hb_num = res.data.user_bonus_list.length
 						console.log(this.hb_num)
 					}
 				})
+				
 			},
 			getImg(){
 				let data ={
@@ -238,7 +244,7 @@
 				let imglist
 				defaultRequest(data).then( res =>{
 					if(res.error ==0){
-						console.log(res,'\\')
+						console.log(res)
 						res.data.zones.map(item =>{
 							if(item.zone_code== 'CBANNER'){
 								imglist = item
@@ -281,7 +287,7 @@
 			getUserInfo(){
 				let data={_action:'getinfo'}
 				defaultRequest(data).then(res=>{
-					// console.info(res,'pppppp')
+					console.info(res,'pppppp')
 					if(res.error==0){
 						 res.data.isLogin=true
 						 // this.user_info=res.data
@@ -295,6 +301,17 @@
 						
 					}
 				})
+				
+				//获取评论
+				let comments = {
+					_action:'getmycomments',
+					page_index:1,
+					page_size:10,
+				}
+				// defaultRequest(comments).then(res=>{
+				// 	console.info(res,'pppppp')
+					
+				// })
 			},
 			imgto(item){
 				

pages/account/myReview.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="body">
-		<navigator url="/pages/productDetails/review">
+		
 			<view class="reviews_item" v-for="(item,index) in 2"  :key="index">
 				<view class="reviews_item_title">
 					<view class="reviews_title_user">
@@ -19,37 +19,77 @@
 					<view class="more_delete" v-show="isShwo">delete</view>
 				</view>
 			</view>
-		</navigator>
+		
 		<view class="mask" v-show="isShwo" @click="isShwo=false"></view>
 	</view>
 </template>
 
 <script>
-	import {defaultRequest,defaultRequest2} from '../../api/index.js'
+	import { encryptDes, decryptDes ,encrypt_by_des } from '@/utils/des.js'
+	import Base64 from 'base-64';
+	import cryptoJS from "crypto-js"
+	import { pathToBase64 } from '@/js_sdk/mmmm-image-tools/index.js'  
+	import {defaultRequest,defaultRequest2,defaultRequest4} from '../../api/index.js'
 	export default {
 		data() {
 			return {
 				isShwo:false,
 				query:{
-					_action:'getgoodscomment',
+					_action:'getmycomments',					
-					goods_id:'',
 					page_index:1,
 					page_size:10,
-					commentlabel:''
+					
 				}
 			}
 		},
 		methods:{
 			getList(){
-				defaultRequest(this.query).then(res=>{
+				let query ={
-					console.info(res)
+					_action:"getmycomments",
+					page_index:1,
+					page_size:20,	
+				}
+				console.log(query)
+				defaultRequest(query).then(res =>{
+					console.log(res)
+				})
+				const json_data={
+						appcode:'DOPE+' ,//应用编码
+						appchannel:'FXXXXHUAWEI' ,//应用发布渠道
+						appver: '1.0.0',//应用版本
+						appname:'cnic_buyer' ,//应用名称
+						manufacturer:'HUAWEI',//设备生产商
+						phonebrand:'HORNOR' ,//设备品牌
+						phonetype:'X30' ,//设备型号
+						phoneos:'ANDROID',// 设备系统
+						_action:'getmycomments',//
+						page_index:1,
+						page_size:20,
+						
+				}
+				let data = encryptDes(JSON.stringify(json_data),'6780f04cf2e211ec86a8005056c00008')
+				uni.request({
+					url:'https://en.meixx.com/mapi/api_v2011.php?appcode=DOPE+',
+					// url:'https://lilbeattranapismits.dopeplus.com/mapi/api_v2011.php?appcode=DOPE+',
+					data:{
+						data:data
+					},
+					 success: (res) => {
+					        console.log(res.data);
+					        // this.text = 'request success';
+							let data2=decryptDes(res.data,'6780f04cf2e211ec86a8005056c00008');
+							console.log(data2)
+					    }
 				})
 			}
 		},
 		onLoad(e) {
-			this.query.goods_id=e.goods_id
+			// this.query.goods_id=e.goods_id
 			this.getList()
-		}
+		},
+		// onShow() {
+		// 	this.getList()
+		// }
 	}
 </script>
 <style>

pages/category/productList.vue

@@ -167,6 +167,7 @@
 				current:0,
 				shop_price:0,
 				tag:0,
+				first:0,//启动页
 			}
 		},
 		methods:{
@@ -375,7 +376,14 @@
 				})
 			},
 			back(){
+				if(this.first == 1){
+					uni.switchTab({
+						url:'../index/index'
+					})
+				}
+				else{
 					uni.navigateBack()
+				}
 			},
 			// 点击预览图片
 			clickImg(index,list) {
@@ -462,7 +470,9 @@
 		},
 		onLoad(e) {
 			console.log(e)
-			
+			if(e.first){
+				this.first = e.first
+			}
 			if(e.gid){
 				this.query.gid = e.gid
 			}

pages/index/first.vue

@@ -30,6 +30,7 @@
 				countdownTime2:5,
 				heightOne:0,
 				heightTwo:0,
+				count:false
 			}
 		},
 			
@@ -91,7 +92,7 @@
 										clearInterval(timer2)
 										this.countdownTime2 = 0
 									}
-									if(this.countdownTime2  ==0){
+									if(this.countdownTime2  ==0 &&!this.count){
 									uni.switchTab({
 										url:'./index'
 									})
@@ -110,18 +111,19 @@
 				
 			},
 			imgTopage(item){
+				this.count = true
 				console.log(111)
 				console.log(item,'item')
 				const i = item.indexOf('?')
 				const str = item.substring(i)
 				if(item.includes('goodid')){
 						uni.navigateTo({
-							url:'../productDetails/index'+str+'&img=1'
+							url:'../productDetails/index'+str+'&first=2'
 						})
 					}
 				else if(item.includes('goodslist')){
 						uni.navigateTo({
-							url:'../category/productList'+ str
+							url:'../category/productList'+ str+'&first=1'
 						})
 					}
 			

pages/index/index.vue

@@ -893,7 +893,7 @@
 				let goodid 
 				
 				if(item.goodid){
-					console.log('9999')
+					
 					uni.navigateTo({
 						url:'../productDetails/index?goodid='+item.goodid
 					})
@@ -1111,6 +1111,7 @@
 	.page_padding_left1{
 		padding-left:  5.67rpx;
 		padding-right: 5.67rpx;
+		padding-top: 90rpx;
 	}
 	
 	.navigation{
@@ -1558,6 +1559,7 @@
 			font-size: 14rpx;
 			line-height: 24rpx;
 			color:white;
+			padding-bottom: 50rpx;
 			
 		}
 		.title{

pages/login/changePwd.vue

@@ -69,5 +69,6 @@
 	
 	.login_submit{
 		font-size: 26.67rpx;
+		color:#fff !important;
 	}
 </style>

pages/login/index.vue

@@ -1,4 +1,5 @@
 <template>
+	<view :style="{background:`url(${bg})`}" class="body">
 	<view class="login_body">
 		<view class="status_bar"></view>
 		<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text" activeColor="#010101" class="select"></uni-segmented-control>
@@ -12,7 +13,7 @@
 				
 				<view class="tips" v-show="loginErr">{{errMsg}}</view>
 				<view class="forgot" @click="forgotPwd">Forgot your Password?</view>
-				<button class="login_submit"  :disabled="isLogin" @click="login()">SIGN IN</button>
+				<button class="login_submit"  :disabled="isLogin" @click="login()" >SIGN IN</button>
 				<!-- <view class="agreement">
 					<image src="../../static/img/select2.png" mode="" class="agreement_image" @click="loginSelect=!loginSelect,loginErr=false" v-show="!loginSelect"></image>
 					<image src="../../static/img/select1.png" mode="" class="agreement_image" @click="loginSelect=!loginSelect" v-show="loginSelect"></image>
@@ -42,7 +43,7 @@
 			</view>
 			
 			<view class="mode">
-				<view class="mode_title">or continue with</view>
+				<view class="mode_title">———  or continue with  ———</view>
 				<view class="mode_content">
 					<image src="/static/img/facebook.png" class="mode_content_image"></image>
 					<image src="/static/img/gugei.png" class="mode_content_image"></image>
@@ -55,6 +56,7 @@
 			@confirm="dialogConfirm" ></uni-popup-dialog>
 		</uni-popup>
 	</view>
+	</view>
 </template>
 
 <script>
@@ -92,7 +94,8 @@
 				query:{
 					_action:'sendmessagesforvalidation',
 					username:'',
-				}
+				},
+				bg:''
 			}
 		},
 		// onBackPress(options) {
@@ -136,9 +139,16 @@
 			},
 			//获取页面配置
 			configuration(){
-				let data={_action:'getpagedata',pagecode:'006-PERSONALCENTERPAG'}
+				let data={_action:'getpagedata',pagecode:'006-PERSONALCENTERPAGE'}
-				defaultRequest1(data).then(res=>{
+				defaultRequest(data).then(res=>{
 					console.info(res)
+					res.data.zones.map( item =>{
+						if(item.zone_code == 'LOGINBG'){
+							this.bg = item.blocks[0].block_pic
+						
+						}
+					})
+					
 				})
 			},
 			// 登录
@@ -256,8 +266,22 @@
 </script>
 
 <style lang="scss" scoped>
+	.body{
+		background-size: 100%;
+		height: 100vh;
+		width: 100%;
+		padding:0;
+		color:#fff !important;
+		position: fixed;
+	}
+	/deep/ .uni-text .segmented-control__text{
+		color:#fff !important;
+	}
 	.login_body{
+		// margin-top: 300rpx;
 		padding-top: 305.33rpx;
+		color:#fff;
+		
 	}
 	.see{
 		height: 30rpx;
@@ -273,15 +297,16 @@
 		
 	}
 	.mode{
-		position: fixed;
+		// position: fixed;
+		margin-top: 300rpx;
 		 bottom: 138.67rpx;
 		width: 100%;
 		left: 0;
 		
 		.mode_title{
 			font-size: 26.67rpx;
-			color: #666666;
+			color: #fff;
-			position: relative;
+			// position: relative;
 			text-align: center;
 			width: 100%;
 			
@@ -289,8 +314,8 @@
 				content: "";
 				height: 1px;
 				width: 89.33rpx;
-				background-color: #BCBCBC;
+				// background-color: #BCBCBC;
-				position: absolute;
+				// position: absolute;
 				left: 20%;
 				top: 50%;
 			}
@@ -298,12 +323,15 @@
 				content: "";
 				height: 1px;
 				width: 89.33rpx;
-				background-color: #BCBCBC;
+				// background-color: darkred;
 				position: absolute;
 				right: 20%;
 				top: 50%;
 			}
 		}
+		.uni-button{
+			background-color: aqua !important;
+		}
 		.mode_content{
 			display: flex;
 			align-items: center;

pages/order/confirmation.vue

@@ -58,17 +58,17 @@
 			<view class="discount_item" @click="openMore(1)">
 				<text>Coupons</text>
 				<view class="discount_item_right">
-					<text v-show="total.bonus!=0">-US${{total.bonus}}</text>
+					<text v-show="bonus>0">-US${{bonus}}</text>
 					<image src="../../static/img/right.png" mode="" class="address_more"></image>
 				</view>
 			</view>
 			<view class="discount_item" @click="openMore(3)">
 				<view class="discount_item_left">
 					<text>Points</text>
-					<text class="discount_item_left_span">({{orderDate.your_integral || 0}})</text>
+					<text class="discount_item_left_span">({{count}})</text>
 				</view>
 				<view class="discount_item_right">
-					<text v-show="isPoints">-US$2.5</text>
+					<text v-if="use&&Points >0 ">-US${{ Points}}</text>
 					<image src="../../static/img/right.png" mode="" class="address_more"></image>
 				</view>
 			</view>
@@ -85,7 +85,7 @@
 			</view>
 			<view class="settlement_item">
 				<text>Discount :</text>
-				<text class="settlement_item_right1">-US${{total.bonus || 0}}</text>
+				<text class="settlement_item_right1">-US${{bonus || 0}}</text>
 			</view>
 		</view>
 		
@@ -184,7 +184,7 @@
 				<!-- </navigator> -->
 			</view>
 			
-			<view class="order_popup_points" v-show="popup_index==3">
+			<!-- <view class="order_popup_points" v-show="popup_index==3">
 				<view class="points_item">
 					<image src="../../static/img/select2.png" mode=""></image>
 					<text>Use points</text>
@@ -193,10 +193,59 @@
 					<image src="../../static/img/select1.png" mode=""></image>
 					<text>Do not use points</text>
 				</view>
-			</view>
+			</view> -->
 			
 		</view>
+		<view class="mask" @click="isCoupons=false,isPoints= false" v-show="(isCoupons && list)||isPoints"></view>
+		<view class="coupons" v-show="isCoupons &&list">
+			<view class="order_popup_title">
+				<text>Coupons</text>
+				<image src="../../static/img/close1.png" mode="" @click="isCoupons=false"></image>
+			</view>
+			<view class="coupons_item" v-for="(item,index) in list " :key="item.bonus_id">
+				<view class="coupons_item_left">
+					<view class="item_left_prcie">${{item.type_money}}</view>
+					<text class="item_left_span">Min.spend</text>
+					<view>${{item.min_goods_amount}}</view>
+				</view>
+				<view class="coupons_item_right">
+					<view class="coupons_right_info">
+						<view class="coupons_right_info_title">{{item.type_name}}</view>
+						<text>The tide zone is available</text>
+						<view class="coupons_right_info_time">{{item.use_start_date}} - {{item.use_end_date}}</view>
+					</view>
 					
+					<view>
+					<view class="select_cop" v-show="current!=index&&parseFloat(item.min_goods_amount) <totalnum ||parseFloat(item.min_goods_amount) ==totalnum ">
+						<image src="../../static/icon/flase.png" @click="current=index,useCoupons(index,item)"></image>
+					</view>
+					<view class="select_cop"v-show="current==index ">
+						<image src="../../static/icon/true.png" @click="current=-1,bonus=0,total.bonus = 0,useCoupons(index,item)"></image>
+					</view>
+					<button @click="gotoindex()">Use Now</button>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- point -->
+		<view class="coupons" v-show="isPoints">
+			<view class="order_popup_title">
+				<text>Points (total:</text><text style="color:darkred">{{ count}} </text>)
+				<image src="../../static/img/close1.png" mode="" @click="isPoints=false"></image>
+			</view>
+			<view class="order_popup_points" @click="Thepoint()" >
+				<view class="points_item">
+					<image src="../../static/img/select2.png" mode="" v-if="!use" @click="use=true,nouse=false"></image>
+					<image src="../../static/img/select1.png" mode="" v-if="use" @click="use=false,nouse=true"></image>
+					<text>Use points</text>
+				</view>
+				<view class="points_item"@click="Thepoint()">
+					<image src="../../static/img/select2.png" mode="" v-if="!nouse " @click="nouse=true,use=false"></image>
+					<image src="../../static/img/select1.png" mode="" v-if="nouse" @click="nouse=false,use=true"></image>
+					<text>Do not use points</text>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -220,6 +269,7 @@
 				goods_list:[],
 				shipping_list:[],
 				bonus_list:[],
+				bonus:0,
 				total:{},
 				order:{
 				  shipping_id:11
@@ -228,32 +278,126 @@
 				pay_index:0,
 				tag:0,
 				orderId:0,
+				list:[] ,//红包列表
+				current:-1,
+				count:0,
+				Points:0,
+				use:false,
+				nouse:true,
+				bouns_id:'',
+				totalnum:0,
+				
+			}
+		},
+		filters: {
+			fnum(a,b) {
+				let tag = false
+				 if(parseFloat(a) < parseFloat(b)|| parseFloat(a) == parseFloat(b))
+				 {
+					 tag = true
+					 
+				 }
+				 return tag;
 				 
 			}
 		},
 		methods:{
 			// 使用红包
-			useCoupons(id){
+			useCoupons(index,item){
+				// this.current = index
+			let total = this.total
+			console.log(this.current)
+			// this.bouns_id = item.bonus_id
+			 //console.log(total)
+			
+				if(this.current == index ){
+				this.bonus = item.type_money
+				//console.log(this.bonus)
+				this.total.bonus = item.type_money
+				let id = item.bonus_id
+				this.bouns_id = item.bonus_id
 				let data={_action:'cartselectbonus',bonus:id,consignee:this.address}
+					console.log(data)
 					defaultRequest3(data,'consignee').then(res=>{
-					     
 						if(res.error==0){
+							
 							this.total=res.data.total
+							console.log(this.total.bonus)
+							uni.setStorageSync('Total',this.total)
 							this.order=res.data.order
-						this.orderId=res.data.order.shiping_id
+							console.log(this.use)
+							//使用了余额
+							// console.log(this.count,this.total.amount,this.Points)
+						    if(this.use){
+								
+								console.log(this.count > this.total.amount)
+								
+								if(this.count > this.total.amount){
+									this.Points = this.total.amount
+									this.total.amount = 0
+									
+								}else if (this.count < this.total.amount || this.count == this.total.amount){
+									this.Points  = this.count
+									let a = (parseFloat(this.Points) + parseFloat(this.total.bonus)).toFixed(2)
+									console.log(this.total.amount)
+									this.total = uni.getStorageSync('total')
+								  let b = (this.total.amount - a ).toFixed(2)
+									console.log(b)
+									this.total.amount = b
+								}
+							
+								
 								}
+								
+								
+							
+							//不使用
+							else{
+								this.Points = 0
+								//console.log(222)
+							}
+							
+							
+						}
+					})
+				
+				}
+				else{
+					this.bonus = 0
+					 this.total = uni.getStorageSync('total')
+					this.bouns_id = 0
+					// this.Points = this.total.amount
+					 //console.log(this.total)
+				}
+			},
+			gotoindex(){
+				uni.switchTab({
+					url:'../index/index'
 				})
 			},
 			// 获取调用支付信息数据
 			getPayDate(id,will_get_integral){
 				let data
+				//console.log(222)
 				if(this.pay_index ==0){
 					data={_action:'payorder',order_id:id,order_type:'GOODSBUY',payment_method:'paypal'}
 					defaultRequest2(data).then(res=>{
-						console.info(data,'支付')
+						////console.info(data,'支付')
-						console.log(res)
+						//console.log(res)
 						if(res.error == 0){
-							if(res.data.need_pay_amount==0) return
+							if(res.data.need_pay_amount==0) 
+								this.isShow = false
+							{
+							setTimeout(() =>{
+								uni.showToast({
+									icon:'none',
+									title:'ok!'
+								})
+							},2000)
+							uni.navigateTo({
+								url:'../account/myOrders'
+							})
+							}
 							 // plus.runtime.openURL(res.data.prepay_data.checkoutnow_url)
 							 // this.src = res.data.prepay_data.checkoutnow_url
 							 uni.navigateTo({
@@ -265,21 +409,36 @@
 				}else{
 					data={_action:'payorder',order_id:id,order_type:'GOODSBUY',payment_method:'alipay.native'}
 					defaultRequest2(data).then(res=>{
-						console.info(res,'支付宝')
+						//console.info(res,'支付宝')
 						if(res.error==0){
 							//订单对象，从服务器获取
-							if(res.data.need_pay_amount==0) return
+							if(res.data.need_pay_amount==0) {
+								if(res.data.need_pay_amount==0)
+									this.isShow = false
+								{
+								setTimeout(() =>{
+									uni.showToast({
+										icon:'none',
+										title:'ok!'
+									})
+									
+								},2000)
+								uni.navigateTo({
+									url:'../account/myOrders'
+								})
+								}
+							}
 							uni.requestPayment({
 							    provider: 'alipay',
 							    orderInfo: res.data.prepay_data.order_info, //支付宝订单数据
 							    success: function (res) {
-							        console.log('success:' + JSON.stringify(res));
+							        ////console.log('success:' + JSON.stringify(res));
 											uni.redirectTo({
 												url: 'paySuccess?type=0&order_id='+id+'&will_get_integral='+will_get_integral
 											});
 							    },
 							    fail: function (err) {
-							        console.log('fail:' + JSON.stringify(err));
+							        ////console.log('fail:' + JSON.stringify(err));
 											uni.redirectTo({
 												url: 'paySuccess?type=1&order_id='+id+'&will_get_integral='+will_get_integral
 											});
@@ -290,6 +449,54 @@
 				}
 				
 				
+			},
+			Thepoint(){
+				//使用余额 使用红包
+				////console.log(this.total)
+				if(this.use && this.current!=-1){
+					this.total = uni.getStorageSync('Total')
+					if(parseFloat(this.count) > this.total.amount){
+						let i = (parseFloat(this.count) - this.total.amount - parseFloat(this.total.bonus)).toFixed(2)
+						// this.Points = (this.total.amount - parseFloat(this.total.bonus)).toFixed(2)
+						this.Points = this.total.amount
+						//console.log(this.Points)
+						this.total.amount = 0
+						
+					}
+					else if(parseFloat(this.count) < this.total.amount){
+						let i = (this.total.amount -parseFloat(this.count)).toFixed(2)
+						// this.total.amount = i
+						this.Points = this.count
+						this.total.amount = (this.total.amount - parseFloat(this.Points)).toFixed(2)
+					}
+				}
+				//使用红包
+				else if(!this.use&& this.current!=-1){
+					this.Points = 0 
+					this.total = uni.getStorageSync('Total')
+				}
+				// 都不使用
+				else if(!this.use&& this.current==-1){
+					this.total = uni.getStorageSync('total')
+				}
+				//使用余额
+				else{
+					if(parseFloat(this.count) > this.total.amount){
+						let i = (parseFloat(this.count) - this.total.amount - parseFloat(this.total.bonus)).toFixed(2)
+						// this.Points = (this.total.amount - parseFloat(this.total.bonus)).toFixed(2)
+						this.Points = this.total.amount
+						//console.log(this.Points)
+						this.total.amount = 0
+						
+					}
+					else if(parseFloat(this.count) < this.total.amount){
+						let i = (this.total.amount -parseFloat(this.count)).toFixed(2)
+						// this.total.amount = i
+						this.Points = this.count
+						this.total.amount = (this.total.amount - parseFloat(this.Points)).toFixed(2)
+					}
+				}
+			
 			},
 			// 选择支付方式
 			selectPay(index){
@@ -307,14 +514,16 @@
 					_action:'submitorder',
 					consignee:this.address,
 					postscript:'',
-					bonus:this.order.bonus,
+					bonus:this.bouns_id,
-					surplus:this.order.surplus,
+					surplus:this.Points,
+					// surplus:this.order.surplus,
 					// shipping_id:this.orderId,
 					 shipping_id:this.order.shipping_id,
 					directshopping:0,
 				}
 				defaultRequest3(data,'consignee').then(res=>{
-					console.info(data)
+					//console.info(res)
+					//console.log(data)
 					if(res.error==0){
 						this.getPayDate(res.data.order.order_id,res.data.will_get_integral)
 					}
@@ -324,7 +533,7 @@
 			cartselectshipping(id){
 				let data={_action:'cartselectshipping',shipping_id:id,consignee:this.address}
 				defaultRequest3(data,'consignee').then(res=>{
-					console.info(res)
+					////console.info(res)
 					if(res.error==0){
 						this.tag = 1
 						this.total=res.data.total
@@ -335,26 +544,50 @@
 			},
 			getList(){
 				defaultRequest3(this.query,'consignee').then(res=>{
-					console.log(this.query)
+					////console.log(this.query)
-					console.info(res)
+					////console.info(res)
 					if(res.error==0){
 						this.orderDate=res.data
 						this.address=res.data.consignee
 						this.goods_list=res.data.goods_list
 						this.shipping_list=res.data.shipping_list
-							console.info(res.data.shipping_list,'1111')
+							// ////console.info(res.data.shipping_list,'1111')
 						if(res.data.bonus_list){
 							this.bonus_list=res.data.bonus_list
 						}
 						this.total=res.data.total
+						this.totalnum = this.total.amount
+						uni.setStorageSync('total',(res.data.total))
+						let ss = uni.getStorageSync('total')
+						////console.log(ss,'0000')
 						this.order=res.data.order
 					}
 				})
+				// 获取红包
+				let data={_action:'getuserbonus'}
+				defaultRequest2(data).then(res=>{
+					////console.info(res)
+					if(res.error==0){
+						this.list=res.data
+					}
+				})
+				//获取余额
+				defaultRequest2({
+					_action:'getusersummarydata'
+				}).then(res =>{
+					////console.log(res)
+					if(res.error ==0){
+						 this.count = res.data.user_info.user_money
+						// this.count = 4.00
+						
+					}
+				})
 			},
 			openMore(i){
 				this.popup_index=i
 				if(i==1){
-					if(this.bonus_list.length==0){
+					this.isCoupons = true
+					if(!this.list){
 						uni.showToast({
 							icon:'none',
 							title:'No coupon available'
@@ -369,7 +602,7 @@
 						return
 					}
 				}else if(i==3){
-					
+					this.isPoints = true
 					if(this.orderDate.allow_use_integral==0){
 						uni.showToast({
 							icon:'none',
@@ -405,18 +638,18 @@
 			if(this.orderId){
 				this.tag =1
 			}
-			console.log(this.orderId,'///')
+			////console.log(this.orderId,'///')
 			this.getList()
 		},
 		onShow(e) {
 			 
 			this.getList()
 			uni.$once('query' ,(query)=>{
-				console.info(query)
+				////console.info(query)
 				 if(query.type=='address'){
 					this.query.consignee=query.consignee
 					this.query.is_new=0
-					console.log(this.query)
+					////console.log(this.query)
 					this.getList()
 				 }
 			});
@@ -608,5 +841,70 @@
 			margin: 0;
 		}
 	} 
+	// 红包
+	.coupons{
+		z-index: 999;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: white;
+		padding-left: 29.33rpx;
+		padding-right: 29.33rpx;
+		box-sizing: border-box;
+		padding-top: 20.67rpx;
+		width: 100%;
+		font-size: 30.67rpx;
+		font-weight: 400;
+		padding-bottom: 17.67rpx;
+		.order_popup_title{
+			position: relative;
+			font-size: 32rpx;
+			font-weight: bold;
+			border-bottom: 1px solid #E2E2E2;
+			display: flex;
+			color:#000;
+			align-items: center;
+			justify-content: center;
+			// padding-top: 44.67rpx;
+			padding-bottom: 20.67rpx;
+			text-align: center;
+			image{
+				width: 21.33rpx;
+				height: 21.33rpx;
+				position: absolute;
+				 right: 26rpx;
+			}
+			}
+		.select_cop{
+			height: 50rpx;
+			width: 50rpx;
+			margin: 0rpx 0rpx 15rpx 80rpx;
+			image{
+				height: 100%;
+				width: 100%;
+			}
+		}
+		.order_popup_points{
+			padding-bottom: 63.33rpx;
+			padding-left: 47.33rpx;
+			padding-top: 34.67rpx;
+			font-size: 28rpx;
+			
+			.points_item{
+				display: flex;
+				align-items: center;
+				margin-bottom: 40rpx;
+				&:last-child{
+					margin-bottom: 0;
+				}
+				
+				image{
+					width: 29.33rpx;
+					height: 29.33rpx;
+					margin-right: 26rpx;
 					
+				}
+			}
+		}
+			}
 </style>

pages/productDetails/index.vue

@@ -473,6 +473,7 @@
 				shipping_list:[],
 				Size_list:'',
 				shop_price:0,
+				first:0,
 				
 				
 				
@@ -798,7 +799,8 @@
 					if(res.error==0){
 						console.log(res.data,'222')
 						this.goodsDate=res.data
-						
+						if(this.goodsDate.comment_list)
+							{
 								if(this.goodsDate.comment_list.length<2){
 									this.commonlist.push(this.goodsDate.comment_list[0])
 								}else if(this.goodsDate.comment_list.length == 0){
@@ -810,6 +812,7 @@
 									}
 									
 								}
+							}
 						
 						console.log(this.commonlist,'11')
 						this.shop_price = this.goodsDate.shop_price
@@ -888,7 +891,14 @@
 				})
 			},
 			back(){
+				if(this.first == 2){
+					uni.navigateTo({
+						url:'../category/index'
+					})
+				}
+				else{
 					uni.navigateBack()
+				}
 			},
 			// 分享1复制
 			Copylink(){
@@ -938,7 +948,9 @@
 		onLoad(e) {
 			// let goods = JSON.parse(e)
 			this.isLogin = uni.getStorageSync('isLogin')
-			
+			if(e.first){
+				this.first = e.first
+			}
 			//console.log(e,'p')
 			
 			this.query.goods_id=e.goodid
@@ -1255,7 +1267,7 @@
 				.active_color{
 					color: #B22234;;
 					background-color: white;
-					// border: 1px solid #000000;
+					border: 1px solid #000000;
 				}
 			}
 			.variations_select_size{

pages/productDetails/review.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-nav-bar  :statusBar="true" left-icon="left"   title="Review" color="#000000"   :fixed="true" @clickLeft="back">
+		<uni-nav-bar  :statusBar="true" left-icon="left"   title="Review" color="#FFF"   backgroundColor="#000" :fixed="true" @clickLeft="back">
 			<block slot="right">
 				<view class="nav_right">
 					<button @click="reviewSub">Submit</button>
@@ -40,24 +40,29 @@
 				<view class="reason_upload">
 					<view class="reason_upload_item" @click="UploadVideo">
 						<image src="/static/img/vedio.png" class="upload_item_camera1" mode=""v-if="!VideoSrc"></image>
-						<image :src="VideoSrc" class="upload_item_camera" mode="" v-else></image>
+						<video :src="VideoSrc" class="upload_item_camera2" mode="" 
-						<view>Upload the video</view>
+						id="videoId" 
+						object-fit="contain"
+						@play="play"
+						@fullscreenchange="fullscreenchange"
+						v-else>
+						</video>
+						<view v-if="!VideoSrc">Upload the video</view>
 					</view>
-					<view class="reason_upload_item" @click="Upimg()">
-						<image src="/static/img/camera.png" class="upload_item_camera" mode="" v-if="!imgSrc"></image>
-						<image :src="imgSrc" class="upload_item_camera" mode="" v-else></image>
-						
-						<!-- <view>Upload pictures</view>
-						
 					
+					<view class="reason_upload_item" @click="Upimg()">
+						<image src="/static/img/camera.png" class="upload_item_camera" mode="" ></image>
+						<!-- <image :src="imgSrc" class="upload_item_camera" mode="" v-else></image> -->
+					   <view>Upload pictures</view>
 					</view>				
-					
+					<view class="reason_upload_item reason_upload_item1" v-if="imgSrc">
-					<view class="reason_upload_item reason_upload_item1">
+						<image :src="imgSrc" class="upload_item_image" mode="" ></image>
-						<!-- <image :src="" class="upload_item_image" mode=""></image> -->
 					</view>
-					
 				</view>
 				<view class="reason_upload_tips">Upload JPG, PNG format, within 3M</view>
+				<!-- <view style="height: 100rpx;width: 100rpx;">
+					<image :src="imgSrc" class="upload_item_image" style="height: 100%;width: 100%;"mode="" ></image>
+				</view> -->
 			</view>
 			
 		</view>
@@ -93,12 +98,37 @@
 					comments:[]
 				},
 				VideoSrc:'',
-				imgSrc:''
+				imgSrc:'',
+				imglist:[],
+				 videoPlay: false,
+				videoUrl: '',
+				ids:[]
+
 			}
 		},
 		methods:{
-			// 提交评论内容
+			
+			
+			// 播放时进入全屏
+			play(index) {
+				let videoContext = uni.createVideoContext('videoId', this)
+				videoContext.requestFullScreen()
+			},
+			 
+			//退出全屏时暂停
+			fullscreenchange(e) {
+				if (!e.detail.fullScreen) {
+					uni.createVideoContext('videoId', this).pause();
+				} 
+			},
+			//退出全屏时停止
+			fullscreenchange (e){
+				if(!e.detail.fullScreen){
+					this.videoContext.stop()
+				}
+			},
 			reviewSub(){
+				this.query.attachments =  this.ids
 				let data
 				if(this.reviewType==0){
 					this.commentordergoods()
@@ -107,6 +137,9 @@
 					this.commentordergoods1()
 				}
 				console.info(data)
+				defaultRequest(this.query).then( res =>{
+					console.log(res)
+				})
 			},
 			// 单个评论内容
 			commentordergoods(){
@@ -145,34 +178,56 @@
 			// 上传视频
 			UploadVideo(){
 				var that = this
+				const json_data={
+						appcode:'DOPE+' ,//应用编码
+						appchannel:'FXXXXHUAWEI' ,//应用发布渠道
+						appver: '1.0.0',//应用版本
+						appname:'cnic_buyer' ,//应用名称
+						manufacturer:'HUAWEI' ,//设备生产商
+						phonebrand:'HORNOR' ,//设备品牌
+						phonetype:'X30' ,//设备型号
+						phoneos:'ANDROID',// 设备系统
+						_action:'uploadcommentfile',//上传图片
+						atype: 2,//视频类型
+						// afile:res.tempFiles[0]
+				}
+				let data = encryptDes(JSON.stringify(json_data),'6780f04cf2e211ec86a8005056c00008');
 				uni.chooseVideo({
 					sourceType: ['camera', 'album'],
 					success: function (res) {
 						console.log(res)
-					 that.VideoSrc = res.tempFilePath;
+					 // that.VideoSrc = res.tempFilePath;
+					 uni.uploadFile({
+					 			url: 'https://lilbeattranapismits.dopeplus.com/mapi/api_v2011.php?appcode=DOPE+', 
+					 			filePath: res.tempFilePath,
+					 			name: 'afile',
+					 			formData:{
+					 				'data':data
+					 			},
+					 			success: (uploadFileRes) => {
+					 				console.log(uploadFileRes);
+					 				 let data=decryptDes(uploadFileRes.data,'6780f04cf2e211ec86a8005056c00008');
+					 			      console.log(JSON.parse(data));
+					 				 let lists = JSON.parse(data)
+									 // this.video = lists.data
+									 that.VideoSrc = lists.data.attachment_url
+									 // console.log(this.VideoSrc,'000')
+									 that.ids.push(lists.data.attachment_id)
+									 console.log(that.ids)
+					 				  // this.imglist = lists.data
+					 				 // that.imglist = this.imglist.push(lists.data)
+					 				 // console.log(that.imglist)
+					 			}
+					 		});
 									}
 				})
 			},
-			
-			// upload(){
-			// 	console.log(1111)
-
-			//     var input = documente.createElement('input');
-			//     input.type = 'file'; 
-			//     input.accept='image/*';
-			//     this.$refs.input.$el.appendChild(input);
-			//     input.onchange = (event) => {  
-			//         this.fileName = event.path[0].files[0].name;
-			//     }  
-			//     $('input').click();
-			// },
-			
 			// 上传图片
 			Upimg(){
 				var that = this
 				let url
 				uni.chooseImage({
-					count: 3, //默认9
+					count: 1, //默认9
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					sourceType: ['album'], //从相册选择
 					success: function (res) {
@@ -224,7 +279,7 @@
 						
 						
 						uni.uploadFile({
-									url: 'https://en.meixx.com/mapi/api_v2011.php', 
+									url: 'https://en.meixx.com/mapi/api_v2011.php?appcode=DOPE+', 
 									filePath: tempFilePaths[0],
 									name: 'afile',
 									formData:{
@@ -233,7 +288,15 @@
 									success: (uploadFileRes) => {
 										console.log(uploadFileRes);
 										 let data=decryptDes(uploadFileRes.data,'6780f04cf2e211ec86a8005056c00008');
-									     console.log(data);
+									      console.log(JSON.parse(data));
+										 let lists = JSON.parse(data)
+										  this.imglist = lists.data
+										  that.imgSrc = lists.data.attachment_url
+										  
+										 // this.imglist = this.imglist.push(lists.data)
+										 console.log(that.imgSrc)
+										 that.ids.push( lists.data.attachment_id)
+										 console.log(that.ids)
 									}
 								});
 					
@@ -245,6 +308,11 @@
 		},
 		onLoad(e) {
 			let datas=JSON.parse(e.data)
+			console.log(datas)
+			this.query.order_id = datas.order_id
+			this.query.order_sn = datas.order_sn
+			this.query.goods_id = datas.order_goods[0].goods_id
+			this.query.rec_id = datas.order_goods[0].grec_id
 			this.orderDate=datas
 			if(datas.order_goods.length>1){
 				this.reviewType=1
@@ -312,6 +380,7 @@
 			margin-bottom: 34.67rpx;
 			.reason_upload_item{
 				border: 1px dashed #D2D2D2;
+				background-size: 100%;
 				border-radius: 15rpx;
 				width: 156rpx;
 				height: 156rpx;
@@ -322,7 +391,10 @@
 				font-size: 12rpx;
 				color: #BFBCBC;
 				margin-right: 23.33rpx;
-				
+				image{
+					height: 100%;
+					width: 100%;
+				}
 				&:nth-child(3n+3){
 					margin-right: 0;
 				}
@@ -337,7 +409,12 @@
 					// margin-bottom: 14rpx;
 					
 				}
+				.upload_item_camera2{
+					width: 156rpx;
+					height: 156rpx;
+				}
 				.upload_item_image{
+					// background-color: aqua;
 					width: 100%;
 					height: 100%;
 					border-radius: 15rpx;

pages/shippingCart/index.vue

@@ -861,7 +861,9 @@
 		font-size: 32rpx;
 		font-weight: bold;
 	}
-
+ .body{
+	 background-color:#fff;
+ }
 	.uni-numbox {
 		border: 1px solid #999999;
 		border-radius: 14rpx;
@@ -923,14 +925,14 @@
 	}
 
 	.cart_info {
-		background-color: white;
+		background-color: #fcfcfc;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
 		padding: 36.67rpx 32rpx;
 		font-size: 24rpx;
 		font-weight: 400;
-
+         // border-bottom: #737373 1rpx dashed;
 		image {
 			width: 41.33rpx;
 			height: 41.33rpx;
@@ -960,7 +962,8 @@
 	}
 
 	.cart {
-		background-color: white;
+		background-color: #fafafa;
+		  
 		margin: 0 18rpx;
 		padding: 42rpx 12.67rpx;
 		margin-top: 16.67rpx;

pages/specialTitle/index.vue

@@ -6,7 +6,7 @@
 		<view v-for="(item1,index1) in item.blocks " :key="item1.block_pic">
 		<view class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'" :style="{height:(item.zone_code=='ONEPIC')?item.zone_column+'rpx':'200rpx'}">
 			<!-- class="discount page_padding" -->
-			<image :src="item1.block_pic" mode="" @click="imgTo()" ></image>
+			<image :src="item1.block_pic" mode="" @click="imgTo(item1)" ></image>
 		</view>
 		<view class="TWOPIC" v-if="item.zone_code =='TWOPIC'">
 			<image :src="item1.block_pic"></image>
@@ -74,7 +74,44 @@
 				uni.navigateBack({
 					delta:1
 				})
+			},
+			imgTo(item){
+				console.log(item,'item')
+				//console.log(item.block_link.includes('dope.youhui'))
+				let goodid 
+				
+				if(item.goodid){
+					
+					uni.navigateTo({
+						url:'../productDetails/index?goodid='+item.goodid
+					})
+				}
+				else if(item.block_link){
+					const i = item.block_link.indexOf('?')
+					 goodid = item.block_link.substring(i);
+					////console.log(item.block_link)
+					if(item.block_link.includes('goodslist')){
+						uni.navigateTo({
+							url:'../category/productList'+ goodid+'&tag=1'
+						})
 					}
+					else if(item.block_link.includes('goodid')){
+						uni.navigateTo({
+							url:'../productDetails/index'+goodid+'&img=1'
+						})
+					}
+					else if(item.block_link.includes('dope.youhui')){
+						uni.navigateTo({
+							url:'./pickUpCentre'
+						})
+					}else if(item.block_link.includes('dope.adspecial')){
+						uni.navigateTo({
+							url:'../specialTitle/index2'+goodid
+						})
+					}
+				}
+				 
+			},
 		}
 	}
 </script>
@@ -86,29 +123,35 @@
 	}
 .ONEPIC{
 		  width: 100%;
-		  height: 480rpx;
+		  height: 100%;
-		  margin-top: -1rpx;
+		   margin: -12rpx 0;
-		
 		image{
 			 height: 100%;
 			 width: 100%;
 		}
+		&:nth-last-child(){
+			margin-bottom: 10rpx;
+		}
 	}
 	.TWOPIC{
 		 width: 100%;
 		display: flex;
+		
 		image{
-			width: 50%;
+			width: 100%;
+			height: 100%;
 		}
 	}
 	.THREEPIC{
 		width: 100%;
 		display: flex;
-		margin: 0;
 		justify-content: space-between;
 		image{
 			width: 100%;
+			height: 100%;
+			
 		}
+		
 	}
 	.FOURPIC{
 		width: 100%;
@@ -116,6 +159,7 @@
 		justify-content: space-between;
 		image{
 			width: 100%;
+			height: 100%;
 		}
 	}
 	.FIVEPIC{
@@ -124,6 +168,7 @@
 		justify-content: space-between;
 		image{
 			width: 100%;
+			height: 100%;
 		}
 	}
 	.SIXPIC{
@@ -132,6 +177,7 @@
 		justify-content: space-between;
 		image{
 			width: 100%;
+			height: 100%;
 		}
 	}
 .body{

pages/specialTitle/index2.vue

@@ -0,0 +1,190 @@
+<template>
+	<view class="body">
+		<view class="one"></view>
+		<uni-nav-bar left-icon="left" @clickLeft="back()" backgroundColor="#000"  color="#fff" :title="title"  />
+	<view v-for="(item,index) in list " :key="item.zone_id">
+		<view v-for="(item1,index1) in item.blocks " :key="item1.block_pic">
+		<view class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'" :style="{height:(item.zone_code=='ONEPIC')?item.zone_column+'rpx':'200rpx'}">
+			<!-- class="discount page_padding" -->
+			<image :src="item1.block_pic" mode="" @click="imgTo(item1)" ></image>
+		</view>
+		<view class="TWOPIC" v-if="item.zone_code =='TWOPIC'">
+			<image :src="item1.block_pic"></image>
+		</view>
+		<!-- TWOPIC -->
+		<view class="TWOPIC" :style="{height:(item.zone_code=='TWOPIC')?item.zone_column+'rpx':'200rpx'}" v-if="item.zone_code=='TWOPIC' && item.zone_status=='NORMAL'">
+			<image :src="item1.block_pic" @click="imgTo(item1)"mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
+		</view>
+		<!-- THREEPIC -->
+		<view class="THREEPIC":style="{height:(item.zone_code=='THREEPIC')?item.zone_column+'rpx':'200rpx'}"   v-if="item.zone_code=='THREEPIC' && item.zone_status=='NORMAL'">
+			<image :src="item1.block_pic"  @click="imgTo(item1)" mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
+		</view>
+		<!-- FOURPIC -->
+		<view class="FOURPIC":style="{height:(item.zone_code=='FOURPIC')?item.zone_column+'rpx':'200rpx'}"  v-if="item.zone_code=='FOURPIC' && item.zone_status=='NORMAL'">
+			<image :src="item1.block_pic" mode=""  @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
+		</view>
+		<!-- FIVEPIC -->
+		<view class="FIVEPIC" :style="{height:(item.zone_code=='FIVEPIC')?item.zone_column+'rpx':'200rpx'}"  v-if="item.zone_code=='FIVEPIC' && item.zone_status=='NORMAL'">
+			<image :src="item1.block_pic" mode=""  @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
+		</view>
+		<!-- SIXPIC -->
+		<view class="SIXPIC":style="{height:(item.zone_code=='SIXPIC')?item.zone_column+'rpx':'200rpx'}" v-if="item.zone_code=='SIXPIC' && item.zone_status=='NORMAL'">
+			<image :src="item1.block_pic" mode="" @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
+		</view>
+	</view>
+	</view>
+	</view>
+</template>
+<script>
+	import {defaultRequest,defaultRequest4} from '../../api/index.js'
+	export default {
+		data() {
+			return {
+				list:[],
+				data: {
+					_action:'getpagedata',
+					pagecode:''
+				},
+				title:''
+			}
+		},
+		onLoad(e) {
+			console.log(e)
+			this.title = e.title
+			this.data.pagecode = e.id
+			this.getpage()
+		},
+		methods: {
+			getpage(){
+			
+				let imglist 
+				defaultRequest(this.data).then( res =>{
+					if(res.error ==0){
+						
+						console.log(res,'数据')
+						 this.list= res.data.zones
+						console.log(this.list)
+						this.list.map( item =>{
+							console.log(item,'item')
+						})
+					}
+				})
+			},
+			back(){
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			imgTo(item){
+				console.log(item,'item')
+				//console.log(item.block_link.includes('dope.youhui'))
+				let goodid 
+				
+				if(item.goodid){
+					
+					uni.navigateTo({
+						url:'../productDetails/index?goodid='+item.goodid
+					})
+				}
+				else if(item.block_link){
+					const i = item.block_link.indexOf('?')
+					 goodid = item.block_link.substring(i);
+					////console.log(item.block_link)
+					if(item.block_link.includes('goodslist')){
+						uni.navigateTo({
+							url:'../category/productList'+ goodid+'&tag=1'
+						})
+					}
+					else if(item.block_link.includes('goodid')){
+						uni.navigateTo({
+							url:'../productDetails/index'+goodid+'&img=1'
+						})
+					}
+					else if(item.block_link.includes('dope.youhui')){
+						uni.navigateTo({
+							url:'./pickUpCentre'
+						})
+					}else if(item.block_link.includes('dope.adspecial')){
+						uni.navigateTo({
+							url:'../specialTitle/index'+goodid
+						})
+					}
+				}
+				 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background-color: aliceblue;
+		margin: 20rpx;
+	}
+.ONEPIC{
+		  width: 100%;
+		  height: 100%;
+		   margin: -12rpx 0;
+		image{
+			 height: 100%;
+			 width: 100%;
+		}
+		&:nth-last-child(){
+			margin-bottom: 10rpx;
+		}
+	}
+	.TWOPIC{
+		 width: 100%;
+		display: flex;
+		
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.THREEPIC{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		image{
+			width: 100%;
+			height: 100%;
+			
+		}
+		
+	}
+	.FOURPIC{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.FIVEPIC{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.SIXPIC{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+.body{
+		.one{
+			height: 50rpx;
+			width: 100%;
+			background-color: #000;
+		}
+	}
+</style>

uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue

@@ -138,6 +138,7 @@
 	}
 
 	.segmented-control__text {
+	   color: aliceblue !important;
 		font-size: 14px;
 		line-height: 20px;
 		text-align: center;

unpackage/resources/__UNI__A6CF3EA/www/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

unpackage/resources/__UNI__A6CF3EA/www/androidPrivacy.json

@@ -0,0 +1,3 @@
+{
+    "prompt" : "none"
+}

unpackage/resources/__UNI__A6CF3EA/www/app-config.js

@@ -0,0 +1 @@
+(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);

unpackage/resources/__UNI__A6CF3EA/www/manifest.json

@@ -0,0 +1 @@
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__A6CF3EA","name":"Dope Plus","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Payment":{},"VideoPlayer":{},"Push":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":false,"waiting":false,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#000000"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.6.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"borderStyle":"rgba(255,255,255,0.4)","backgroundColor":"#FFFFFF","color":"#999999","selectedColor":"#000000","height":"60px","midButton":{"width":"80px","height":"70px","iconWidth":"60px","iconPath":"static/img/tabbar_img.png"},"list":[{"pagePath":"pages/index/index","iconPath":"static/icon/home3.png","selectedIconPath":"static/icon/home4.png","text":"Home"},{"pagePath":"pages/category/index","iconPath":"static/img/Category.png","selectedIconPath":"static/img/Category1.png","text":"Category"},{"pagePath":"pages/shippingCart/index","iconPath":"static/img/Cart.png","selectedIconPath":"static/img/cart1.png","navigationBarTextStyle":"#000000","text":"Cart"},{"pagePath":"pages/account/index","iconPath":"static/img/Account.png","selectedIconPath":"static/img/Account1.png","text":"Account"}]},"launch_path":"__uniappview.html"}}