Browse Source

修改样式及其他

306132416@qq.com 6 years ago
parent
commit
2d2d039f9f

+ 8 - 22
pages/index/index.vue

@@ -38,7 +38,7 @@
 			<input type="text" class="enter-box" v-model="inputInfo" :adjust-position="true"
 		    @confirm='sendInputInfo' />
 			<!-- <button type="primary" class="submit-message" @click="sendInputInfo()">发送</button> -->
-			<image src="/static/icon/setIcon.png"  @click.stop='open' ></image>
+			<image src="/static/setIcon.png"  @click.stop='openModal()' ></image>
 		</view>
 		 <!-- <drag-button :isDock="true" :existTabBar="true"  @btnClick="goUserSelf" /> -->
 		<uni-popup ref="popup" type="bottom">
@@ -58,14 +58,13 @@
 </template>
 
 <script>
-	// import navigationCustom from "../../components/struggler-navigationCustom/navigation-custom";
-	//import dragButton from "../../components/drag-button/drag-button.vue";
 	import uniPopup from "@/components/uni-popup/uni-popup.vue"
 	var md5 = require("../../common/md5.js");
 	var page = 1;
 	export default {
 		data() {
 			return {
+				isShowSetModal:false,
 				title: 'RABOT',
 				nowTime: '',
 				nowHeight: '622px',
@@ -74,17 +73,6 @@
 				rabotHeadImg: "../../static/rabotHead.png",
 				userHeadUrl: getApp().globalData.user_headUrl || '../../static/userDefault.png',
 				talkList: [],
-				config: {
-					title: "阿拉丁神灯", //title
-					bgcolor: "#fff", //背景颜色
-					fontcolor: "black", //文字颜色,默认白色
-					type: 3, //type 1,3胶囊 2,4无胶囊模式
-					transparent: false, //是否背景透明 默认白色
-					linear: true, //是为开启下滑渐变
-					share: true, //是否将主页按钮显示为分享按钮
-					menuIcon: "../../static/icon/iconfont-user.png", //当type为3或者4的时候左边的icon文件位置,注意位置与当前页面不一样
-					// menuText:"返回", 当type为3或4的时候icon右边的文字
-				},
 				scrollTopNav: 0, // 当linear为true的时候需要通过onpagescroll传递参数
 				scrollMaxHeight: 200 ,//滑动的高度限制,超过这个高度即背景全部显示
 				scrollTop:0,
@@ -99,8 +87,6 @@
 			}
 		},
 		components: {
-			//navigationCustom
-			//dragButton
 			uniPopup
 		},
 		onPageScroll(e) {
@@ -164,7 +150,7 @@
 				this.nowHeight = height + 'px';
 				getApp().globalData.glbalHeight = this.nowHeight;
 				this.style.pageHeight = height;
-				this.style.contentViewHeight = height - uni.getSystemInfoSync().screenWidth / 750 * (100) -5; //像素   因为给出的是像素高度 然后我们用的是upx  所以换算一下 
+				this.style.contentViewHeight = height - uni.getSystemInfoSync().screenWidth / 750 * (100) -7; //像素   因为给出的是像素高度 然后我们用的是upx  所以换算一下 
 			},
 			scrollToBottom() {
 				let that = this;
@@ -276,13 +262,13 @@
 			getInputBlur(){
 				//this.isShowKeyBoard = 0
 			},
-			open(){
+			openModal(){
 			        // 需要在 popup 组件,指定 ref 为 popup
-			         this.$refs.popup.open()
+			         this.$refs.popup.open();
 			      },
 			cancelModal(){
 				          // 需要在 popup 组件,指定 ref 为 popup
-				           this.$refs.popup.close()
+				     this.$refs.popup.close();
 			  }
 			},
 		}
@@ -326,6 +312,7 @@
 		background: #F4F0ED;
 		display: flex;
 		align-items: center;
+		padding: 2upx;
 	}
 
 	.talk-box {
@@ -369,11 +356,10 @@
 	.enter-box {
 		width: 85%;
 		height: 70rpx;
-		margin-left: 5px;
-		margin-right: 10px;
 		background: #fff;
 		border-radius: 1%;
 		text-align: left;
+		margin: 8px
 	}
     .send-box image {
 		width: 60rpx;

+ 6 - 4
pages/selfInfo/payList/payList.vue

@@ -15,7 +15,7 @@
 		</view>
 		
 		<view class="pay-box">
-			<view style="margin-left: 5%;">{{packageMoney}}</view>
+			<view style="margin-left: 5%;">{{packageMoney}}</view>
 			<button type="primary" class="submit-message" @click="payPackage()">购买</button>
 		</view>
 	
@@ -31,7 +31,7 @@
 				selectId:'',
 				packageMoney:'',
 				searchList:[
-					{
+				/* 	{
 						times:'100',
 						money:'10',
 						id:'1',	
@@ -44,7 +44,7 @@
 						times:'300',
 						money:'30',
 						id:'3',	
-					},
+					}, */
 				],
 			}
 		},
@@ -67,7 +67,9 @@
 						sign: md5('charge_rule_list' + getApp().globalData.globalTimestamp),
 					},
 					success: res => {
-						that.searchList = res.data.msg
+						that.searchList = res.data.msg;
+						that.selectId = res.data.msg[0].id;
+						that.packageMoney = res.data.msg[0].money
 					}
 				});
 			},

+ 4 - 4
pages/selfInfo/rechargeRecord/rechargeRecord.vue

@@ -3,11 +3,11 @@
 		
 		<view class="recharge-box" v-for="pay in payList" :key='pay.id'>
 			 <view class="recharge-time-box">
-				 <view class="recharge-font">智能投顾</view>
-				 <view class="recharge-time">{{pay.paytime}}</view>
+				 <view class="recharge-font">微信充值</view>
+				 <view class="recharge-time">{{pay.paytime}} · {{pay.times}}次</view>
 			 </view>
 			 <view class="recharge-money"> 
-				 <text>{{pay.money}}</text>
+				 <text>{{pay.money}}</text>
 			 </view>
 		</view>
 		<view v-if='payList.length === 0' style="font-size: 14px;margin-top: 5%;">
@@ -89,7 +89,7 @@
 	 }
 	 .recharge-font {
 		 font-size: 30upx;
-		 margin-left: -10%;
+		 margin-left: -65%;
 	 }
 	 .recharge-time {
 		 color:#D9D9D9;

BIN
static/icon/setIcon.png


BIN
static/setIcon.png