Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

yudao-ui-app/pages.json

@@ -11,9 +11,9 @@
 			}
 		},
     {
-    	"path": "pages/member_loding/index",
+    	"path": "pages/member_rule/index",
     	"style": {
-    		"navigationBarTitleText": "会员"
+    		"navigationBarTitleText": "充值规则"
     	}
     },{
     	"path": "pages/notice/index",

yudao-ui-app/pages/member_application/index.vue

@@ -24,16 +24,21 @@
       </view>
     </view>
     <view class="box-privilege">
+      <view class=""></view>
       <view class="box-title">
         <image src='../../static/images/memberTitle.png'></image>
       </view>
       <view class="privilege-list">
-
-        <view class="privilege-item" v-for="(item,index) in 4" :key="index">
-          <image src='../../static/images/vip1.png'></image>
-          <text class="privilege-text">
-            开通立享大额话费返送。
-          </text>
+        <view class="privilege-left">
+          <image src='../../static/images/money_look.png'></image>
+          <view class="privilege-text">
+            <text>查看充值注意事项！</text>
+            <text>点击右侧按钮</text>
+          </view>
+        </view>
+        <view class="privilege-right" @click="handleRule">
+          <text>查看</text>
+           <view></view>
         </view>
       </view>
     </view>
@@ -127,6 +132,11 @@
       }
     },
     methods: {
+      handleRule(){
+        uni.navigateTo({
+          url:'/pages/member_rule/index'
+        })
+      },
       handleOther(){
         uni.navigateTo({
           url:'/pages/member_others/index'
@@ -439,7 +449,7 @@
           justify-content: center;
 
           &::before {
-            content: '特权详情';
+            content: '注意事项';
             position: absolute;
             font-size: 34rpx;
             font-family: Adobe Heiti Std;
@@ -452,32 +462,66 @@
       }
 
       .privilege-list {
-        margin: 54rpx 10rpx 10rpx 10rpx;
+        width: 100%;
+        margin: 54rpx 30rpx 20rpx 30rpx;
+        min-height: 110rpx;
+        background: #FFFFFF;
+        border-radius: 20rpx;
         display: flex;
+        align-items: center;
         justify-content: space-between;
+        padding: 3% 20rpx 1% 20rpx;
 
-        .privilege-item {
+        .privilege-left {
           display: flex;
-          flex-direction: column;
           align-items: center;
           justify-content: space-between;
-          background: #fff;
-          padding: 6rpx 16rpx;
           border-radius: 20rpx;
-          margin: 0 10rpx;
 
           image {
-            width: 96rpx;
-            height: 96rpx;
-            border-radius: 50%;
-            margin-bottom: 15rpx;
+            width: 68rpx;
+            height: 64rpx;
+            margin-right: 12rpx;
           }
 
           .privilege-text {
-            color: #000000;
-            line-height: 36rpx;
-            text-align: center;
-            font-size: 26rpx;
+            display: flex;
+            flex-direction: column;
+            text:nth-child(1){
+              font-size: 30rpx;
+              font-family: PingFang SC;
+              font-weight: 400;
+              color: #000000;
+            }
+            text:nth-child(2){
+            font-size: 24rpx;
+            font-family: PingFang SC;
+            font-weight: 400;
+            color: #FB394B;
+            }
+          }
+        }
+        .privilege-right{
+          background-image: url("../../static/images/others-button.png");
+          background-size: 144rpx 64rpx;
+          font-size: 28rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #FFFFFF;
+          width: 144rpx;
+          height: 64rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: relative;
+          view {
+            position: absolute;
+            right: 0;
+            top: -24%;
+            width: 18rpx;
+            height: 6rpx;
+            background: #FEAC49;
+            border-radius: 3rpx;
           }
         }
 

yudao-ui-app/pages/member_loding/index.vue

@@ -1,52 +0,0 @@
-<template>
-
-</template>
-
-<script>
-  import {
-    memberGradeInfo
-  } from '@/api/member.js';
-
-  export default {
-    name: "member_loding",
-    data() {
-      return {
-        };
-    },
-
-    async onLoad() {
-      try{
-        uni.showLoading({
-        	title: '加载中'
-        });
-        const res = await memberGradeInfo()
-             if(res.data.some((item) => !!parseInt(item.isExist))){
-               uni.setTabBarItem({
-                 index: 2,
-                 pagePath: '/pages/member_equity/index'
-               })
-               uni.switchTab({
-                 url:'/pages/member_equity/index'
-               })
-             }else{
-               uni.setTabBarItem({
-                 index: 2,
-                 pagePath: '/pages/member_application/index'
-               })
-               uni.switchTab({
-                 url:'/pages/member_application/index'
-               })
-             }
-      } finally{
-        uni.hideLoading();
-      }
-    },
-    methods: {
-
-    }
-  };
-</script>
-
-<style lang="scss" scoped>
-
-</style>

yudao-ui-app/pages/member_rule/index.vue

@@ -0,0 +1,34 @@
+<template>
+ <view class="content">
+  <image src="../../static/images/rule.png" mode=""></image>
+  <u-navbar autoBack  title="充值规则"></u-navbar>
+ </view>
+</template>
+
+<script>
+
+  export default {
+    name: "member_rule",
+    data() {
+      return {
+        };
+    },
+
+    async onLoad() {
+
+    },
+    methods: {
+
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+.content{
+  image{
+    margin-top: 10%;
+    width: 100%;
+    min-height: 255vh;
+  }
+}
+</style>