refactor:权益卡

common/js/env.js

@@ -1,8 +1,8 @@
 "use strict";
 
-// let baseUrl = `https://jje.admin.xinyuekj.com.cn`
+let baseUrl = `https://jje.admin.xinyuekj.com.cn`
 // let baseUrl = `http://127.0.0.1:9000`
-let baseUrl = `http://192.168.1.150:8080`
+// let baseUrl = `http://192.168.1.150:8080`
 
 // 变量可自行添加修改
 export default { //存放变量的容器

myPages/promotionCenter/index.vue

@@ -31,9 +31,9 @@
         </view>
 
 
-<!--        <view class="btn" @click="goStatisticalPanel">-->
-<!--            <text>去提现</text>-->
-<!--        </view>-->
+        <view class="btn" @click="goStatisticalPanel">
+            <text>去提现</text>
+        </view>
 
     </view>
 </template>

orderPages/storeService/index.vue

@@ -51,6 +51,7 @@ export default {
     }
   },
   onLoad() {
+    this.listServiceObject()
   },
   onShow() {
     // 服务对象
@@ -75,6 +76,17 @@ export default {
     //     })
     // },
 
+    // 查询服务对像信息列表
+    listServiceObject(){
+      this.$api.listServiceObject(this.reqParm).then((res)=>{
+        this.serviceObject = res.data.data[0]
+      }).catch((err) =>{
+        uni.showToast({
+          title: "操作失败"
+        })
+      });
+    },
+
     selectedServiceObject(e) {
       this.serviceObject = e
       console.log('++++++++++++selectedServiceObject++++++++++++++', e)

pages.json

@@ -231,7 +231,7 @@
 				{
 					"path": "promotionCenter/index",
 					"style": {
-						"navigationBarTitleText": "推广统计",
+						"navigationBarTitleText": "我的推广",
 						"enablePullDownRefresh": false
 					}
 				},
@@ -347,6 +347,13 @@
 		{
 			"root": "storePages",
 			"pages": [
+				{
+					"path": "rights/index",
+					"style": {
+						"navigationBarTitleText": "权益卡",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "store/store-choose",
 					"style": {

pages/index/index.vue

@@ -1,7 +1,6 @@
 <template>
   <view class="content-wrap bg-color">
 
-
     <view class="head-wrap ">
       <view class="content-info ">
 
@@ -26,8 +25,7 @@
             <!-- 欢迎语 -->
             <view class="welcome-wrap">
               <view class="logo">
-                <image v-if="userInfo.selfPhotoUrl" :src="userInfo.selfPhotoUrl" mode=""></image>
-                <image v-else src="../../static/logo.png" mode=""></image>
+                <image  :src="userInfo.selfPhotoUrl || '/../static/logo.png'" mode=""></image>
               </view>
               <view class="text">
                 <view class="phone">{{ userInfo.cellPhone }}</view>
@@ -45,29 +43,29 @@
             </view>
 
             <!-- 余额信息 -->
-            <view class="balance-info">
-              <view @click="gotoRechargeService()" class="balance-amount">
-                <text class="number" v-if="userInfo.balance">￥{{ userInfo.balance }}</text>
-                <text class="number" v-else>￥0.00</text>
-                <view class="">余额</view>
-              </view>
-              <view @click="gotoIntgral()" class="score-info">
-                <text class="number" v-if="userInfo.integral">{{ userInfo.integral }}</text>
-                <text class="number" v-else>0</text>
-                <view class="">积分</view>
-              </view>
-              <view @click="gotoCoupon()" class="coupon-info">
-                <text class="number" v-if="userInfo.coupon">{{ userInfo.coupon }}</text>
-                <text class="number" v-else>0</text>
-                <view class="">优惠券</view>
-
-              </view>
-              <view class="e-currency-info">
-                <text class="number" v-if="userInfo.electronicCurrency">{{ userInfo.electronicCurrency }}</text>
-                <text class="number" v-else>0</text>
-                <view class="">电子币</view>
-              </view>
-            </view>
+<!--            <view class="balance-info">-->
+<!--              <view @click="gotoRechargeService()" class="balance-amount">-->
+<!--                <text class="number" v-if="userInfo.balance">￥{{ userInfo.balance }}</text>-->
+<!--                <text class="number" v-else>￥0.00</text>-->
+<!--                <view class="">余额</view>-->
+<!--              </view>-->
+<!--              <view  class="score-info">-->
+<!--                <text class="number" v-if="userInfo.integral">{{ userInfo.integral }}</text>-->
+<!--                <text class="number" v-else>0</text>-->
+<!--                <view class="">积分</view>-->
+<!--              </view>-->
+<!--              <view @click="gotoCoupon()" class="coupon-info">-->
+<!--                <text class="number" v-if="userInfo.coupon">{{ userInfo.coupon }}</text>-->
+<!--                <text class="number" v-else>0</text>-->
+<!--                <view class="">优惠券</view>-->
+
+<!--              </view>-->
+<!--              <view class="e-currency-info">-->
+<!--                <text class="number" v-if="userInfo.electronicCurrency">{{ userInfo.electronicCurrency }}</text>-->
+<!--                <text class="number" v-else>0</text>-->
+<!--                <view class="">电子币</view>-->
+<!--              </view>-->
+<!--            </view>-->
 
             <view class="custom-line"></view>
 
@@ -162,12 +160,12 @@
                 </view>
               </view>
               <view class="button-wrap">
-                <view @click="gotoReceiveCoupons()" class="btn">
+                <view @click="goRights()" class="btn">
                   <view class="icon">
                     <u-icon name="/static/index/u247.png" color="red" size="30"></u-icon>
                   </view>
                   <view class="name">
-                    领优惠券
+                    权益卡
                   </view>
                 </view>
               </view>
@@ -308,6 +306,13 @@ export default {
 
     },
 
+
+    goRights(){
+      uni.navigateTo({
+        url: '/storePages/rights/index'
+      })
+    },
+
     // 去服务点单页面
     gotoServiceOrder() {
       uni.navigateTo({
@@ -380,15 +385,7 @@ export default {
         })
       })
     },
-    // 积分详细页面
-    gotoIntgral() {
-      uni.$u.route({
-        url: '/pages/integral/integral',
-        params: {
-          name: 'lisa'
-        }
-      })
-    },
+
     getNoticeListData() {
       let req = {
         auth: true,
@@ -411,10 +408,9 @@ export default {
     getImgUrlByOssId(ossId) {
       if (ossId) {
         this.$api.getImage(ossId).then(res => {
-          console.log('++++++++用户头像+++++++++++++++', res)
+          this.userInfo.selfPhotoUrl = res.data.data[0].url.replace(/^http:/, "https:")
+          this.$set(this.userInfo)
         })
-        this.userInfo.selfPhotoUrl = url;
-        return url;
       }
 
     },
@@ -490,7 +486,7 @@ export default {
 
 /* 头部内容 */
 .head-wrap {
-  height: 2200rpx;
+  height: 1850rpx;
   background: #FFE05C;
 
   .content-info {
@@ -535,9 +531,8 @@ export default {
 
           .logo {
             width: 13%;
-
             image {
-              border-radius: 15px;
+              border-radius: 18px;
               width: 36px;
               height: 36px;
             }

pages/my/index.vue

@@ -113,7 +113,7 @@ export default {
 				// {thumb:'/static/me/u1796.png',title:'贡献奖励记录',rightText:'',to:''},
 				{thumb:'/static/me/u1803.png',title:'实名认证',rightText:'',to:'/myPages/realNameAuth/index'},
 				// {thumb:'/static/me/u1812.png',title:'服务对象管理',rightText:'',to:'/myPages/ServiceObjectManagement/index'},
-        		{thumb:'/static/me/u3.png',title:'推广中心',rightText:'',to:'/myPages/promotionCenter/index'},
+        		{thumb:'/static/me/u3.png',title:'我的推广',rightText:'',to:'/myPages/promotionCenter/index'},
 				// {thumb:'/static/me/u1833.png',title:'新老系统切换',rightText:'',to:'/myPages/systemSwitch/index'},
 				{thumb:'/static/me/u826.png',title:'储值服务',rightText:'',to:'/myPages/recharge/index'}
 			],

pages/qrCode/index.rpx.css

@@ -27,6 +27,7 @@
 .imageLogo{
     width: 200rpx;
     height: 200rpx;
+    border-radius: 100rpx;
 }
 .member-content{
     margin-top: 140rpx;

pages/qrCode/index.vue

@@ -4,8 +4,7 @@
 		<view class="content" :style="{'height':height}">
 			<view class="outView flex-col">
 				<view class="member-head-img flex-row justify-center">
-					<image class="imageLogo" v-if="selfPhotoUrl" :src="selfPhotoUrl" mode=""></image> <!-- 用户头像 -->
-					<image class="imageLogo" v-else src="../../static/logo.png" mode=""></image> <!-- 用户头像 -->
+					<image class="imageLogo"  :src="selfPhotoUrl || '/static/logo.png'" mode=""></image> <!-- 用户头像 -->
 				</view>
 				<view class="member-content flex-col">
 					<view class="user-name flex-row justify-center">

storePages/rights/index.rpx.scss

@@ -0,0 +1,5 @@
+.page{
+  background: #F7F7F7;
+  padding: 0 32rpx;
+  border-top: 1px solid #F7F7F7 ;
+}

storePages/rights/index.vue

@@ -0,0 +1,29 @@
+<template>
+	<view class="page">
+
+
+
+
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+			};
+		},
+		onLoad(option) {
+		},
+
+		methods: {
+
+
+		},
+	};
+</script>
+<style lang="scss" scoped>
+
+	@import '/common/css/common.css';
+	@import './index.rpx.scss';
+
+</style>