edit

lib/dever/index.js

@@ -841,7 +841,8 @@ var dever = {
 	web_view : '/lib/dever/pages/web_view',
 	source : 'h5',
 	source_id : 1,
-	host : '',
+	host : '',
+	api_host : '',
 	doc : false,
 	config : {},
 	vue : false,
@@ -867,11 +868,12 @@ var dever = {
 	init : function(url, vue, value, set) {
 		this.vue = vue;
 		vue.prototype.$config = value;
-		var self = this;
-		var config = self.data('dever_config');
+		var self = this;
+		this.api_host = config.request.host;
+		var dever_config = self.data('dever_config');
 		var state = false;
-		if (config && !set) {
-			self.config = config;
+		if (dever_config && !set) {
+			self.config = dever_config;
 			vue.prototype.$config = self.config;
 			if (self.config.update_time) {
 				var time = this.curTime();

lib/dever/pages/web_view.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-	        <web-view :src="url" @message="callback"></web-view>
+	        <web-view :src="url" :webview-styles="webviewStyles" @message="callback"></web-view>
 	</view>
 </template>
 
@@ -8,10 +8,18 @@
 export default {
 	data() {
 		return {
-			url: '',
+			url: '',
+			webviewStyles: {
+				progress: false,
+			}
 		};
 	},
-	onLoad: function(option) {
+	onLoad: function(option) {
+		if (option && option.name) {
+			uni.setNavigationBarTitle({
+				title:option.name
+			});
+		}
 		this.url = this.Dever.data('web_view');
 	},
 	onShow: function() {},

lib/yq-avatar/yq-avatar.vue

@@ -1269,6 +1269,8 @@
 	.my-avatar {
 		width: 150upx;
 		height: 150upx;
+		width: 0upx;
+		height: 0upx;
 		border-radius: 100%;
 	}
 

pages.json

@@ -111,6 +111,17 @@
 		    	},
 				"enablePullDownRefresh" : false
 		    }
+		},
+		{
+		    "path" : "lib/dever/pages/web_view",
+		    "style": {
+		    	"app-plus": {
+		    		"titleNView": false,
+		    		"bounce": "none",
+		    		"navigationStyle": "custom"
+		    	},
+				"enablePullDownRefresh" : false
+		    }
 		}
     ],
 	"globalStyle": {

pages/dream/func/my.vue

@@ -15,10 +15,31 @@
 				<text class="grace-list-arrow-right grace-icons icon-arrow-right" style="display:none;"></text>
 			</view>
 		</view>
-		<view class="ucenter-line"></view>
-		<view>
-			<graceBoxBanner :items="fetch.num"></graceBoxBanner>
-		</view>
+		<view class="ucenter-line" v-if="fetch.num.length > 0"></view>
+		<view v-if="fetch.num.length > 0">
+			<graceBoxBanner :items="fetch.num" @taped="showScore"></graceBoxBanner>
+		</view>
+		
+		<graceDialog :isTitle="true" :title="scoreTitle" :isCloseBtn="true" :show="score" closeBtnColor="#FFFFFF" v-on:closeDialog="closeScore">
+			<scroll-view :scroll-y="true" class="padding" slot="content" style="height:800rpx;">
+				<view class="zhList padding margin-tb" v-for="(v, k) in fetch.score" :key="k">
+					<view class="flex justify-between">
+						<view class="text-black font-30 block margin-bottom-xs text-bold">{{v.title}}</view>
+						<view class="text-bold text-red" v-if="v.status == 2">-{{v.num}}</view>
+						<view class="text-bold text-blue" v-if="v.status == 1">+{{v.num}}</view>
+					</view>
+					<view class="text-999 flex justify-between margin-top align-center">
+						<text class="font-24">余额：{{v.total}}</text>
+						<text class="font-24 block">{{v.cdate}}</text>
+					</view>
+				</view>
+			</scroll-view>
+			
+			<view slot="btns" class="grace-space-between">
+				<text class="grace-dialog-buttons" @tap="closeScore">关闭</text>
+			</view>
+		</graceDialog>
+		
 		<view class="ucenter-line"></view>
 		<view class="grace-list grace-margin-top">
 			<view class="card-bottom">
@@ -125,24 +146,42 @@ export default {
     	return {
 			fetch : {
 				user : {},
-				num : [
-					['￥0', '', '--'],
-					[0, '', '--'],
-				],
+				num : [],
 				order : [],
-				chat : [],
+				chat : [],
+				score : [],
 			},
 			activeTab : 0,
+			//关系
 			cate : [
-				'信息', '买过', '关系'
+				'个人资料', '购物订单'
 			],
-			openAvatar : false
+			openAvatar : false,
+			score : false,
+			scoreTitle : '',
 		}
     },
 	mounted() {
 		this.getData();
 	},
 	methods:{
+		showScore : function(index) {
+			console.info(index);
+			var info = this.fetch.num[index];
+			var title = info[2] + '：' + info[0];
+			this.getScore(1, info[3], title);
+		},
+		getScore : function(page, method, title) {
+			var self = this;
+			this.Dever.page([page, 'score'], this, 'app/user/?l=api.score', {code:this.Dever.config.code,method:method}, function(t) {
+				self.fetch.score = t.score;
+				self.scoreTitle = title;
+				self.score = true;
+			});
+		},
+		closeScore : function() {
+			this.score = false;
+		},
 		getData : function() {
 			if (this.openAvatar) {
 				return;
@@ -255,5 +294,17 @@ export default {
 }
 .grace-form-input {
 	text-align: left;
-}
+}
+
+.top{ background-color: #FB5858;}
+.btnOne{width:300rpx;height:80rpx;background:rgba(255,255,255,1);box-shadow:0rpx 2rpx 24rpx 0rpx rgba(251,88,88,1);border-radius:40rpx;}
+.line{width:1rpx;height:43rpx;background:rgba(255,255,255,1);}
+.zhList1{background:rgba(255,255,255,1);box-shadow:1px 5px 24px 0px rgba(161,161,161,0.38);border-radius:5px;}
+.zhList{background:rgba(255,255,255,1);border-bottom:1px solid rgba(161,161,161,0.38);}
+.text-91b{ color: #21A91B;}
+.text-101{ color: #FF0101;}
+.erro-404 {padding-bottom: 100upx;}
+.erro-404 image {width: 260upx; height: 260upx;}
+.font-24 {font-size: 12px;}
+.text-999 {color: #999;}
 </style>

pages/user/login.vue

@@ -49,7 +49,7 @@
 					:class="showAgree?'cuIcon-radiobox':'cuIcon-round'"
 				> 同意</text>
 				<!-- 协议地址 -->
-				<navigator url="" open-type="navigate">《入境协议》</navigator>
+				<view @click="goView('agreement', '入记协议')">《入记协议》</view>
 			</view>
 			
 			<!-- 其他登录 -->
@@ -121,6 +121,11 @@
 					self.system_logo = self.Dever.config.system_logo;
 				}
 			},
+			goView : function(key, name) {
+				var path = this.Dever.api_host + 'main/?l=page&key=' + key;
+				this.Dever.web_view = '/lib/dever/pages/web_view?name=' + name;
+				this.Dever.location(path, 'webview');
+			},
 			isShowAgree(){
 				//是否选择协议
 				self.showAgree = !self.showAgree;
@@ -133,7 +138,6 @@
 				}
 				self.$refs.runCode.$emit('runCode');
 				self.Dever.post('package/passport/?l=reg.getMCode', {noloading:1, mobile: self.phoneData}, function(t) {
-					console.info(t);
 					if (t.indexOf('::') != -1) {
 						var temp = t.split('::');
 						t = temp[0];
@@ -151,7 +155,7 @@
 					return false;
 				}
 				if (self.showAgree == false) {
-					self.Dever.alert('请先同意《协议》');
+					self.Dever.alert('请先同意《入记协议》');
 				    return false;
 				}
 				if (self.phoneData.length !=11) {