Merge branch 'dongjian' into develop

pages/mine_package/mine_settings/mine_settings.vue

@@ -63,6 +63,11 @@
 					<view>关于我们</view>
 					<up-image src="/static/common/right.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
 				</view>
+				<view class="header_fg"></view>
+				<view class="item_comm" @click="jumpInfo('contract')">
+					<view>我的合同</view>
+					<up-image src="/static/common/right.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
+				</view>
 			</view>
 
 			<view class="login_out_warp" @click="loginOutFun">
@@ -135,6 +140,10 @@ export default {
 				uni.navigateTo({
 					url: '/pages/mine_package/mine_product_agreement/mine_product_agreement'
 				})
+			}else if(type === 'contract'){
+				uni.navigateTo({
+					url:'/pages/contract/index'
+				})
 			}
 		},
 		// 跳转到交易密码