Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair

# Conflicts:
#	config.js
#	pages/home/active.vue
#	utils/common.js

components/VNavigationBar.vue

@@ -20,7 +20,7 @@
 		</template>
 		<view class="navigationBarBackExtra">
 			<slot name="extra">
-				</slot?>
+				</slot>
 		</view>
 	</view>
 </template>

config.js

@@ -1,8 +1,7 @@
 // 应用全局配置
 module.exports = {
 	// baseUrl: 'https://www.nuoyunr.com',
-	baseUrl: 'http://127.0.0.1:48080',
+	baseUrl: 'http://192.168.1.4:48080',
-	// baseUrl: 'http://192.168.1.31:48080',
 	imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
 	baseImageUrl: 'https://www.nuoyunr.com/minio/',
 	wsUrl: 'wss://www.nuoyunr.com',

pages/home/active.vue

@@ -3,15 +3,26 @@
     <v-navigation-bar title-color="#333" background-color="#fff" title="活动列表">
     </v-navigation-bar>
     <view class="body">
-      <view class="cardItem">
+        <uni-card :title="item.name"  v-for="item in activeList">
-        <view class="cardItemTop" v-for="item in activeList">
+          <text class="uni-body">{{ item.remark }}</text>
-          <view class="cardInfo">
+          <view slot="actions" class="card-actions">
-            <view class="cardName">{{ item.name }}</view>
+            <picker v-if="item.type=='kkyl'" @change="bindPickerChange" :value="index" :range="array">
-            <view class="cardName">{{ item.remark }}</view>
+              <button @click="joinAct(item)" type="primary">参加</button>
+            </picker>
+            <view v-if="item.type!='kkyl'">
+              <button @click="joinAct(item)" v-if="item.isJoin!='1'" type="primary">参加</button>
+              <button @click="joinAct(item)" v-if="item.isJoin=='1'" disabled type="primary">参加</button>
             </view>
           </view>
+        </uni-card>
+      <uni-section title="输入框示例" type="line" padding>
+        <view class="dialog-box">
+          <text class="dialog-text">输入内容：{{ value }}</text>
+        </view>
+        <button class="button" type="primary" @click="inputDialogToggle"><text
+            class="button-text">输入对话框</text></button>
 
-      </view>
+      </uni-section>
     </view>
   </view>
 </template>
@@ -19,15 +30,23 @@
 <script>
 import VNavigationBar from '@/components/VNavigationBar.vue'
 import request from "@/utils/request";
+import {getUserInfoRequest} from "@/utils/common.js";
+import {getToken,setUserInfo} from '@/utils/auth.js'
 export default {
   components: {
     VNavigationBar,
   },
   data() {
     return {
-
+      value:"",
+      index:0,
+      array:[],
+      couponList:[],
+      orderInfo:{},
       customInfo: {},
       activeList: [],
+      //开卡有礼活动id
+      kkylActId:"",
       tabList: [{
         value: 0,
         title: '礼包券'
@@ -41,19 +60,37 @@ export default {
     };
   },
   onShow(data) {
-    this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
+    if(!getToken()){
-	this.getActive()
+      uni.reLaunch({
+        url: '/pages/login/login'
+      })
+    }else{
+      console.log("已登录")
+      this.getUserInfos()
+    }
   },
   onLoad(data) {
     this.getActive()
   },
   methods: {
+    inputDialogToggle(){
 
+    },
+    bindPickerChange(e){
+      this.index = e.detail.value
+      console.log("index",this.index)
+      this.joinKkylAct()
+    },
+    //获取当前登录用户信息
+    async getUserInfos() {
+      await getUserInfoRequest()
+      await this.getActive()
+    },
     //查询营销活动列表
     async getActive() {
-      let customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
+      this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
       const data = {
-        cusId: customInfo.id
+        cusId: this.customInfo.id
       }
       await request({
         url: '/userClient/customer/activeList',
@@ -61,11 +98,75 @@ export default {
         params:data
       }).then((res) => {
         this.activeList = res.data
+        for(var i = 0; i < this.activeList.length; i++) {
+          if(this.activeList[i].type=="kkyl"){
+            this.kkylActId = this.activeList[i].id
+             request({
+              url: "/userClient/customer/getActive",
+              method: "get",
+              params:{id:this.activeList[i].id}
+            }).then((res) => {
+              if(res.data.hasOwnProperty("couponList")&&res.data.couponList.length>0){
+                this.couponList = res.data.couponList
+                for(var i = 0; i < res.data.couponList.length; i++) {
+                  var coupon = res.data.couponList[i]
+                  this.array.push(coupon.name+"("+coupon.amount+")")
+                }
+                this.$forceUpdate()
+              }
             })
+          }
+        }
+      })
+
+    },
+    /**
+     * 参加活动
+     * @param item
+     * @returns {Promise<void>}
+     */
+    async joinAct(item){
+      let dataObj = {}
+      let url = ""
+      let method = "POST"
+      if(item.type == 'zcyl'){
+        //注册有礼
+        dataObj.cusId = this.customInfo.id
+        dataObj.activeId = item.id
+        url = "/userClient/customer/attendActive"
+        await request({
+          url: url,
+          method: method,
+          data:dataObj
+        }).then((res) => {
+          console.log(res);
+          this.orderInfo = res.data
+        })
+      }else if(item.type == 'kkyl'){
+        //开卡有礼
 
       }
 
-    //参与营销活动
+    },
+    /**
+     * 参加开卡有礼活动
+     * @returns {Promise<void>}
+     */
+    async joinKkylAct(){
+      let dataObj = {}
+      dataObj.cusId = this.customInfo.id
+      dataObj.activeId = this.kkylActId
+      dataObj.accountType='01'
+      dataObj.selectCoupon=[this.couponList[this.index]]
+      await request({
+        url: "/userClient/customer/attendActive",
+        method: "POST",
+        data:dataObj
+      }).then((res) => {
+        console.log(res);
+        this.orderInfo = res.data
+      })
+    }
 
 
   }
@@ -93,138 +194,7 @@ export default {
 
     overflow: auto;
 
-
-    .cardItem {
-      background: #FFFFFF;
-      border-radius: 16 rpx 16 rpx 16 rpx 16 rpx;
-      padding: 30 rpx;
-    }
-
-    .cardItemTop {
-      display: flex;
-      align-items: center;
-      column-gap: 16 rpx;
-      padding-bottom: 32 rpx;
-      border-bottom: 1px solid #ddd;
-    }
-
-    .cardImg {
-      width: 136 rpx;
-      height: 100 rpx;
-      background-color: #efefef;
-
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      position: relative;
-
-      .cardImgText {
-        color: #fff;
-        font-size: 24 rpx;
-        position: relative;
-        z-index: 2;
-      }
-
-      .cardImgBg {
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        top: 0;
-        left: 0;
-        z-index: 1;
   }
 }
 
-    .cardInfo {
-      flex: 1;
-      width: 0;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-
-      padding: 6 rpx 0;
-
-      .cardName {
-        font-size: 32 rpx;
-        color: #333333;
-      }
-
-      .cardEndDate {
-        font-size: 24 rpx;
-        color: #999999;
-      }
-    }
-
-    .cardInfoRight {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      font-size: 24 rpx;
-      color: #FC4D4A;
-
-      .cardNumValue {
-        font-size: 64 rpx;
-      }
-
-      .cardLabel {
-        color: #999999;
-      }
-    }
-  }
-
-  .cardItemBottom {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 30 rpx 0 0;
-
-    .useSm {
-      font-size: 24 rpx;
-      color: #999999;
-    }
-
-    .useBtn {
-      width: 144 rpx;
-      height: 60 rpx;
-      border-radius: 30 rpx 30 rpx 30 rpx 30 rpx;
-      border: 1 rpx solid #FC4D4A;
-      font-size: 28 rpx;
-      color: #FC4D4A;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-}
-
-.tabbar {
-  background-color: #fff;
-  display: flex;
-  align-items: center;
-
-  .tabItem {
-    flex: 1;
-    width: 0;
-
-    display: flex;
-    justify-content: center;
-    padding: 30 rpx 0;
-
-    position: relative;
-  }
-
-  .activeLine {
-    width: 52 rpx;
-    height: 8 rpx;
-    background: #009EDA;
-    border-radius: 4 rpx 4 rpx 4 rpx 4 rpx;
-
-    position: absolute;
-    left: 50%;
-    bottom: 2 rpx;
-    transform: translate(-50%, 0);
-  }
-}
 </style>

pages/my/register.vue

@@ -61,6 +61,7 @@
 <script>
 import VNavigationBar from '@/components/VNavigationBar.vue'
 import request from "../../utils/request";
+import {getUserInfoRequest} from "@/utils/common.js";
 import {
   setToken,
 } from '@/utils/auth.js'
@@ -119,6 +120,7 @@ export default {
           data: this.formData
         }).then((res) => {
           if (res.code==200) {
+            getUserInfoRequest()
              uni.reLaunch({
                url: '/pages/home/home'
              })

uni_modules/uni-icons/changelog.md

@@ -1,29 +1,3 @@
-## 2.0.10（2024-06-07）
-- 优化 uni-app x 中，size 属性的类型
-## 2.0.9（2024-01-12）
-fix: 修复图标大小默认值错误的问题
-## 2.0.8（2023-12-14）
-- 修复 项目未使用 ts 情况下，打包报错的bug
-## 2.0.7（2023-12-14）
-- 修复 size 属性为 string 时，不加单位导致尺寸异常的bug
-## 2.0.6（2023-12-11）
-- 优化 兼容老版本icon类型，如 top ，bottom 等
-## 2.0.5（2023-12-11）
-- 优化 兼容老版本icon类型，如 top ，bottom 等
-## 2.0.4（2023-12-06）
-- 优化 uni-app x 下示例项目图标排序
-## 2.0.3（2023-12-06）
-- 修复 nvue下引入组件报错的bug
-## 2.0.2（2023-12-05）
--优化 size 属性支持单位
-## 2.0.1（2023-12-05）
-- 新增 uni-app x 支持定义图标
-## 1.3.5（2022-01-24）
-- 优化 size 属性可以传入不带单位的字符串数值
-## 1.3.4（2022-01-24）
-- 优化 size 支持其他单位
-## 1.3.3（2022-01-17）
-- 修复 nvue 有些图标不显示的bug，兼容老版本图标
 ## 1.3.2（2021-12-01）
 - 优化 示例可复制图标名称
 ## 1.3.1（2021-11-23）

uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -1,22 +1,14 @@
 <template>
 	<!-- #ifdef APP-NVUE -->
-	<text :style="styleObj" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" @click="_onClick">{{unicode}}</text>
 	<!-- #endif -->
 	<!-- #ifndef APP-NVUE -->
-	<text :style="styleObj" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick">
+	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
-		<slot></slot>
-	</text>
 	<!-- #endif -->
 </template>
 
 <script>
-	import { fontData } from './uniicons_file_vue.js';
+	import icons from './icons.js';
-
-	const getVal = (val) => {
-		const reg = /^[0-9]*$/g
-		return (typeof val === 'number' || reg.test(val)) ? val + 'px' : val;
-	}
-
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
 	import iconUrl from './uniicons.ttf'
@@ -55,33 +47,20 @@
 			customPrefix:{
 				type: String,
 				default: ''
-			},
-			fontFamily: {
-				type: String,
-				default: ''
 			}
 		},
 		data() {
 			return {
-				icons: fontData
+				icons: icons.glyphs
 			}
 		},
 		computed:{
 			unicode(){
 				let code = this.icons.find(v=>v.font_class === this.type)
 				if(code){
-					return code.unicode
+					return unescape(`%u${code.unicode}`)
 				}
 				return ''
-			},
-			iconSize() {
-				return getVal(this.size)
-			},
-			styleObj() {
-				if (this.fontFamily !== '') {
-					return `color: ${this.color}; font-size: ${this.iconSize}; font-family: ${this.fontFamily};`
-				}
-				return `color: ${this.color}; font-size: ${this.iconSize};`
 			}
 		},
 		methods: {
@@ -95,10 +74,9 @@
 <style lang="scss">
 	/* #ifndef APP-NVUE */
 	@import './uniicons.css';
-
 	@font-face {
 		font-family: uniicons;
-		src: url('./uniicons.ttf');
+		src: url('./uniicons.ttf') format('truetype');
 	}
 
 	/* #endif */
@@ -107,4 +85,5 @@
 		text-decoration: none;
 		text-align: center;
 	}
+
 </style>

uni_modules/uni-icons/components/uni-icons/uniicons.css

@@ -1,12 +1,3 @@
-
-.uniui-cart-filled:before {
-  content: "\e6d0";
-}
-
-.uniui-gift-filled:before {
-  content: "\e6c4";
-}
-
 .uniui-color:before {
   content: "\e6cf";
 }
@@ -67,6 +58,10 @@
   content: "\e6c3";
 }
 
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
 .uniui-fire-filled:before {
   content: "\e6c5";
 }
@@ -87,18 +82,6 @@
   content: "\e698";
 }
 
-.uniui-arrowthinleft:before {
-  content: "\e6d2";
-}
-
-.uniui-arrowthinup:before {
-  content: "\e6d3";
-}
-
-.uniui-arrowthindown:before {
-  content: "\e6d4";
-}
-
 .uniui-back:before {
   content: "\e6b9";
 }
@@ -111,52 +94,64 @@
   content: "\e6bb";
 }
 
+.uniui-arrowthinright:before {
+  content: "\e6bb";
+}
+
 .uniui-arrow-left:before {
   content: "\e6bc";
 }
 
+.uniui-arrowthinleft:before {
+  content: "\e6bc";
+}
+
 .uniui-arrow-up:before {
   content: "\e6bd";
 }
 
+.uniui-arrowthinup:before {
+  content: "\e6bd";
+}
+
 .uniui-arrow-down:before {
   content: "\e6be";
 }
 
-.uniui-arrowthinright:before {
+.uniui-arrowthindown:before {
-  content: "\e6d1";
+  content: "\e6be";
-}
-
-.uniui-down:before {
-  content: "\e6b8";
 }
 
 .uniui-bottom:before {
   content: "\e6b8";
 }
 
-.uniui-arrowright:before {
+.uniui-arrowdown:before {
-  content: "\e6d5";
+  content: "\e6b8";
 }
 
 .uniui-right:before {
   content: "\e6b5";
 }
 
-.uniui-up:before {
+.uniui-arrowright:before {
-  content: "\e6b6";
+  content: "\e6b5";
 }
 
 .uniui-top:before {
   content: "\e6b6";
 }
 
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
 .uniui-left:before {
   content: "\e6b7";
 }
 
-.uniui-arrowup:before {
+.uniui-arrowleft:before {
-  content: "\e6d6";
+  content: "\e6b7";
 }
 
 .uniui-eye:before {
@@ -643,6 +638,10 @@
   content: "\e627";
 }
 
+.uniui-cart-filled:before {
+  content: "\e629";
+}
+
 .uniui-checkbox:before {
   content: "\e62b";
 }

uni_modules/uni-icons/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "2.0.10",
+  "version": "1.3.2",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
@@ -17,6 +17,10 @@
     "example": "../../temps/example_temps"
   },
   "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
     "sale": {
       "regular": {
         "price": "0.00"
@@ -33,8 +37,7 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-    "type": "component-vue"
   },
   "uni_modules": {
     "dependencies": ["uni-scss"],
@@ -42,14 +45,12 @@
     "platforms": {
       "cloud": {
         "tcb": "y",
-        "aliyun": "y",
+        "aliyun": "y"
-        "alipay": "n"
       },
       "client": {
         "App": {
           "app-vue": "y",
-          "app-nvue": "y",
+          "app-nvue": "y"
-          "app-uvue": "y"
         },
         "H5-mobile": {
           "Safari": "y",
@@ -69,15 +70,11 @@
           "阿里": "y",
           "百度": "y",
           "字节跳动": "y",
-          "QQ": "y",
+          "QQ": "y"
-					"钉钉": "y",
-					"快手": "y",
-					"飞书": "y",
-					"京东": "y"
         },
         "快应用": {
-          "华为": "y",
+          "华为": "u",
-          "联盟": "y"
+          "联盟": "u"
         },
         "Vue": {
             "vue2": "y",

uni_modules/uni-popup/changelog.md

@@ -1,25 +1,3 @@
-## 1.9.2（2024-09-21）
-- 修复 uni-popup在android上的重复点击弹出位置不正确的bug
-## 1.9.1（2024-04-02）
-- 修复 uni-popup-dialog vue3下使用value无法进行绑定的bug(双向绑定兼容旧写法)
-## 1.9.0（2024-03-28）
-- 修复 uni-popup-dialog 双向绑定时初始化逻辑修正
-## 1.8.9（2024-03-20）
-- 修复 uni-popup-dialog 数据输入时修正为双向绑定
-## 1.8.8（2024-02-20）
-- 修复 uni-popup 在微信小程序下出现文字向上闪动的bug
-## 1.8.7（2024-02-02）
-- 新增 uni-popup-dialog 新增属性focus：input模式下，是否自动自动聚焦
-## 1.8.6（2024-01-30）
-- 新增 uni-popup-dialog 新增属性maxLength:限制输入框字数
-## 1.8.5（2024-01-26）
-- 新增 uni-popup-dialog 新增属性showClose:控制关闭按钮的显示
-## 1.8.4（2023-11-15）
-- 新增 uni-popup 支持uni-app-x 注意暂时仅支持 `maskClick` `@open` `@close`
-## 1.8.3（2023-04-17）
-- 修复 uni-popup 重复打开时的 bug
-## 1.8.2（2023-02-02）
-- uni-popup-dialog 组件新增 inputType 属性
 ## 1.8.1（2022-12-01）
 - 修复 nvue 下 v-show 报错
 ## 1.8.0（2022-11-29）

uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -10,15 +10,14 @@
 		</view>
 		<view v-else class="uni-dialog-content">
 			<slot>
-				<input class="uni-dialog-input" :maxlength="maxlength" v-model="val" :type="inputType"
+				<input class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholderText" :focus="focus" >
-					:placeholder="placeholderText" :focus="focus">
 			</slot>
 		</view>
 		<view class="uni-dialog-button-group">
-			<view class="uni-dialog-button" v-if="showClose" @click="closeDialog">
+			<view class="uni-dialog-button" @click="closeDialog">
 				<text class="uni-dialog-button-text">{{closeText}}</text>
 			</view>
-			<view class="uni-dialog-button" :class="showClose?'uni-border-left':''" @click="onOk">
+			<view class="uni-dialog-button uni-border-left" @click="onOk">
 				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
 			</view>
 		</view>
@@ -32,16 +31,13 @@
 	initVueI18n
 	} from '@dcloudio/uni-i18n'
 	import messages from '../uni-popup/i18n/index.js'
-	const {
+	const {	t } = initVueI18n(messages)
-		t
-	} = initVueI18n(messages)
 	/**
 	 * PopUp 弹出层-对话框样式
 	 * @description 弹出层-对话框样式
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
 	 * @property {String} value input 模式下的默认值
 	 * @property {String} placeholder input 模式下输入提示
-	 * @property {Boolean} focus input模式下是否自动聚焦，默认为true
 	 * @property {String} type = [success|warning|info|error] 主题样式
 	 *  @value success 成功
 	 * 	@value warning 提示
@@ -50,10 +46,8 @@
 	 * @property {String} mode = [base|input] 模式、
 	 * 	@value base 基础对话框
 	 * 	@value input 可输入对话框
-	 * @showClose {Boolean} 是否显示关闭按钮
 	 * @property {String} content 对话框内容
 	 * @property {Boolean} beforeClose 是否拦截取消事件
-	 * @property {Number} maxlength 输入
 	 * @event {Function} confirm 点击确认按钮触发
 	 * @event {Function} close 点击取消按钮触发
 	 */
@@ -61,30 +55,12 @@
 	export default {
 		name: "uniPopupDialog",
 		mixins: [popup],
-		emits: ['confirm', 'close', 'update:modelValue', 'input'],
+		emits:['confirm','close'],
 		props: {
-			inputType: {
-				type: String,
-				default: 'text'
-			},
-			showClose: {
-				type: Boolean,
-				default: true
-			},
-			// #ifdef VUE2
 			value: {
 				type: [String, Number],
 				default: ''
 			},
-			// #endif
-			// #ifdef VUE3
-			modelValue: {
-				type: [Number, String],
-				default: ''
-			},
-			// #endif
-
-
 			placeholder: {
 				type: [String, Number],
 				default: ''
@@ -116,19 +92,12 @@
 			confirmText:{
 				type: String,
 				default: ''
-			},
-			maxlength: {
-				type: Number,
-				default: -1,
-			},
-			focus: {
-				type: Boolean,
-				default: true,
 			}
 		},
 		data() {
 			return {
 				dialogType: 'error',
+				focus: false,
 				val: ""
 			}
 		},
@@ -156,37 +125,23 @@
 				}
 			},
 			value(val) {
-				if (this.maxlength != -1 && this.mode === 'input') {
-					this.val = val.slice(0, this.maxlength);
-				} else {
 				this.val = val
 			}
 		},
-			val(val) {
-				// #ifdef VUE2
-				// TODO 兼容 vue2
-				this.$emit('input', val);
-				// #endif
-				// #ifdef VUE3
-				// TODO　兼容　vue3
-				this.$emit('update:modelValue', val);
-				// #endif
-			}
-		},
 		created() {
 			// 对话框遮罩不可点击
 			this.popup.disableMask()
 			// this.popup.closeMask()
 			if (this.mode === 'input') {
 				this.dialogType = 'info'
-				this.val = this.value;
+				this.val = this.value
-				// #ifdef VUE3
-				this.val = this.modelValue;
-				// #endif
 			} else {
 				this.dialogType = this.type
 			}
 		},
+		mounted() {
+			this.focus = true
+		},
 		methods: {
 			/**
 			 * 点击确认按钮
@@ -216,6 +171,11 @@
 </script>
 
 <style lang="scss" >
+	$uni-primary: #007aff !default;
+	$uni-success: #4cd964 !default;
+	$uni-warning: #f0ad4e !default;
+	$uni-error: #dd524d !default;
+	
 	.uni-popup-dialog {
 		width: 300px;
 		border-radius: 11px;
@@ -285,7 +245,7 @@
 	}
 
 	.uni-button-color {
-		color: #007aff;
+		color: $uni-primary;
 	}
 
 	.uni-dialog-input {
@@ -299,15 +259,15 @@
 	}
 
 	.uni-popup__success {
-		color: #4cd964;
+		color: $uni-success;
 	}
 
 	.uni-popup__warn {
-		color: #f0ad4e;
+		color: $uni-warning;
 	}
 
 	.uni-popup__error {
-		color: #dd524d;
+		color: $uni-error;
 	}
 
 	.uni-popup__info {

uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue

@@ -47,7 +47,7 @@
 					{
 						text: '支付宝',
 						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
-						name: 'ali'
+						name: 'wx'
 					},
 					{
 						text: 'QQ',

uni_modules/uni-popup/components/uni-popup/uni-popup.vue

@@ -5,7 +5,7 @@
 				:duration="duration" :show="showTrans" @click="onTap" />
 			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
 				:show="showTrans" @click="onTap">
-				<view class="uni-popup__wrapper" :style="getStyles" :class="[popupstyle]" @click="clear">
+				<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear">
 					<slot />
 				</view>
 			</uni-transition>
@@ -39,7 +39,6 @@
 	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
 	 * @property {String}  backgroundColor 主窗口背景色
 	 * @property {String}  maskBackgroundColor 蒙版颜色
-	 * @property {String}  borderRadius 设置圆角(左上、右上、右下和左下) 示例:"10px 10px 10px 10px"
 	 * @property {Boolean} safeArea		   是否适配底部安全区
 	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
 	 * @event {Function} maskClick 点击遮罩触发
@@ -87,9 +86,6 @@
 				type: String,
 				default: 'rgba(0, 0, 0, 0.4)'
 			},
-			borderRadius:{
-				type: String,
-			}
 		},
 
 		watch: {
@@ -161,25 +157,16 @@
 					backgroundColor: 'rgba(0, 0, 0, 0.4)'
 				},
 				transClass: {
-					backgroundColor: 'transparent',
-					borderRadius: this.borderRadius || "0",
 					position: 'fixed',
 					left: 0,
 					right: 0
 				},
 				maskShow: true,
 				mkclick: true,
-				popupstyle: 'top'
+				popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
 			}
 		},
 		computed: {
-			getStyles() {
-				let res = { backgroundColor: this.bg };
-				if (this.borderRadius || "0") {
-					res = Object.assign(res, { borderRadius: this.borderRadius })
-				}
-				return res;
-			},
 			isDesktop() {
 				return this.popupWidth >= 500 && this.popupHeight >= 500
 			},
@@ -234,12 +221,6 @@
 			this.setH5Visible()
 		},
 		// #endif
-		activated() {
-   	  this.setH5Visible(!this.showPopup);
-    },
-    deactivated() {
-      this.setH5Visible(true);
-    },
 		created() {
 			// this.mkclick =  this.isMaskClick || this.maskClick
 			if (this.isMaskClick === null && this.maskClick === null) {
@@ -259,10 +240,10 @@
 			this.maskClass.backgroundColor = this.maskBackgroundColor
 		},
 		methods: {
-			setH5Visible(visible = true) {
+			setH5Visible() {
 				// #ifdef H5
 				// fix by mehaotian 处理 h5 滚动穿透的问题
-				document.getElementsByTagName('body')[0].style.overflow =  visible ? "visible" : "hidden";
+				document.getElementsByTagName('body')[0].style.overflow = 'visible'
 				// #endif
 			},
 			/**
@@ -288,7 +269,8 @@
 			open(direction) {
 				// fix by mehaotian 处理快速打开关闭的情况
 				if (this.showPopup) {
-					return
+					clearTimeout(this.timer)
+					this.showPopup = false
 				}
 				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
 				if (!(direction && innerType.indexOf(direction) !== -1)) {
@@ -342,15 +324,13 @@
 					position: 'fixed',
 					left: 0,
 					right: 0,
-					backgroundColor: this.bg,
+					backgroundColor: this.bg
-					borderRadius:this.borderRadius || "0"
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
 				this.showPopup = true
 				this.showTrans = true
 				this.$nextTick(() => {
-					this.showPoptrans()
 					if (this.messageChild && this.type === 'message') {
 						this.messageChild.timerClose()
 					}
@@ -368,25 +348,19 @@
 					right: 0,
 					bottom: 0,
 					paddingBottom: this.safeAreaInsets + 'px',
-					backgroundColor: this.bg,
+					backgroundColor: this.bg
-					borderRadius:this.borderRadius || "0",
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
-				this.showPoptrans()
+				this.showPopup = true
+				this.showTrans = true
 			},
 			/**
 			 * 中间弹出样式处理
 			 */
 			center(type) {
 				this.popupstyle = 'center'
-				//微信小程序下，组合动画会出现文字向上闪动问题，再此做特殊处理
-				// #ifdef MP-WEIXIN
-					this.ani = ['fade']
-				// #endif
-				// #ifndef MP-WEIXIN
 				this.ani = ['zoom-out', 'fade']
-				// #endif
 				this.transClass = {
 					position: 'fixed',
 					/* #ifndef APP-NVUE */
@@ -398,12 +372,12 @@
 					right: 0,
 					top: 0,
 					justifyContent: 'center',
-					alignItems: 'center',
+					alignItems: 'center'
-					borderRadius:this.borderRadius || "0"
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
-				this.showPoptrans()
+				this.showPopup = true
+				this.showTrans = true
 			},
 			left(type) {
 				this.popupstyle = 'left'
@@ -414,7 +388,6 @@
 					bottom: 0,
 					top: 0,
 					backgroundColor: this.bg,
-					borderRadius:this.borderRadius || "0",
 					/* #ifndef APP-NVUE */
 					display: 'flex',
 					flexDirection: 'column'
@@ -422,7 +395,8 @@
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
-				this.showPoptrans()
+				this.showPopup = true
+				this.showTrans = true
 			},
 			right(type) {
 				this.popupstyle = 'right'
@@ -433,7 +407,6 @@
 					right: 0,
 					top: 0,
 					backgroundColor: this.bg,
-					borderRadius:this.borderRadius || "0",
 					/* #ifndef APP-NVUE */
 					display: 'flex',
 					flexDirection: 'column'
@@ -441,13 +414,8 @@
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
-				this.showPoptrans()
-			},
-			showPoptrans(){
-				this.$nextTick(()=>{
 				this.showPopup = true
 				this.showTrans = true
-				})
 			}
 		}
 	}

uni_modules/uni-popup/package.json

@@ -1,7 +1,7 @@
 {
 	"id": "uni-popup",
 	"displayName": "uni-popup 弹出层",
-	"version": "1.9.2",
+	"version": "1.8.1",
 	"description": " Popup 组件，提供常用的弹层",
 	"keywords": [
         "uni-ui",
@@ -46,8 +46,7 @@
 		"platforms": {
 			"cloud": {
 				"tcb": "y",
-                "aliyun": "y",
+				"aliyun": "y"
-                "alipay": "n"
 			},
 			"client": {
 				"App": {

utils/common.js

@@ -1,3 +1,5 @@
+import request from "@/utils/request";
+import {setUserInfo,getUserInfo} from '@/utils/auth.js'
 /**
 * 显示消息提示框
 * @param content 提示的标题
@@ -52,3 +54,23 @@ export function tansParams(params) {
   }
   return result
 }
+
+/**
+ * 获取当前登录用户信息
+ * @returns {Promise<void>}
+ */
+export async function getUserInfoRequest(){
+  const res = await request({
+    url: "/userClient/customer/getUserCustomer",
+    method: 'get',
+    params:{}
+  })
+  if(!res.data){
+    uni.reLaunch({
+      url: '/pages/my/register'
+    })
+  }else{
+    setUserInfo(JSON.stringify(res.data))
+    return res.data
+  }
+}