From 0596468486fe5aa156b6c6dee5d916a00d173c35 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Fri, 27 Sep 2024 19:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E5=8A=A0=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/VNavigationBar.vue                 |   4 +-
 config.js                                     |   2 +-
 pages/home/active.vue                         | 247 ++++++++----------
 pages/my/register.vue                         |   8 +-
 uni_modules/uni-icons/changelog.md            |  26 --
 .../components/uni-icons/uni-icons.vue        |  49 +---
 .../components/uni-icons/uniicons.css         |  65 +++--
 .../components/uni-icons/uniicons.ttf         | Bin 35824 -> 35760 bytes
 uni_modules/uni-icons/package.json            |  29 +-
 uni_modules/uni-popup/changelog.md            |  22 --
 .../uni-popup-dialog/uni-popup-dialog.vue     |  98 ++-----
 .../uni-popup-share/uni-popup-share.vue       |   2 +-
 .../components/uni-popup/uni-popup.vue        |  68 ++---
 uni_modules/uni-popup/package.json            |   5 +-
 utils/common.js                               |   2 +-
 15 files changed, 220 insertions(+), 407 deletions(-)

diff --git a/components/VNavigationBar.vue b/components/VNavigationBar.vue
index 9f4aebc..94fc5be 100644
--- a/components/VNavigationBar.vue
+++ b/components/VNavigationBar.vue
@@ -20,7 +20,7 @@
 		</template>
 		<view class="navigationBarBackExtra">
 			<slot name="extra">
-				</slot?>
+				</slot>
 		</view>
 	</view>
 </template>
@@ -109,4 +109,4 @@
 			font-weight: bold;
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/config.js b/config.js
index 32be26b..c727c99 100644
--- a/config.js
+++ b/config.js
@@ -1,7 +1,7 @@
 // 应用全局配置
 module.exports = {
 	// baseUrl: 'https://www.nuoyunr.com',
-	baseUrl: 'http://127.0.0.1:48080',
+	baseUrl: 'http://192.168.1.4:48080',
 	imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
 	baseImageUrl: 'https://www.nuoyunr.com/minio/',
 	wsUrl: 'wss://www.nuoyunr.com',
diff --git a/pages/home/active.vue b/pages/home/active.vue
index 558f730..630394c 100644
--- a/pages/home/active.vue
+++ b/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">
-        <view class="cardItemTop" v-for="item in activeList">
-          <view class="cardInfo">
-            <view class="cardName">{{ item.name }}</view>
-            <view class="cardName">{{ item.remark }}</view>
+        <uni-card :title="item.name"  v-for="item in activeList">
+          <text class="uni-body">{{ item.remark }}</text>
+          <view slot="actions" class="card-actions">
+            <picker v-if="item.type=='kkyl'" @change="bindPickerChange" :value="index" :range="array">
+              <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>
@@ -27,9 +38,15 @@ export default {
   },
   data() {
     return {
-
+      value:"",
+      index:0,
+      array:[],
+      couponList:[],
+      orderInfo:{},
       customInfo: {},
       activeList: [],
+      //开卡有礼活动id
+      kkylActId:"",
       tabList: [{
         value: 0,
         title: '礼包券'
@@ -51,22 +68,29 @@ export default {
       console.log("已登录")
       this.getUserInfos()
     }
-    this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
-	  this.getActive()
   },
   onLoad(data) {
     this.getActive()
   },
   methods: {
+    inputDialogToggle(){
+
+    },
+    bindPickerChange(e){
+      this.index = e.detail.value
+      console.log("index",this.index)
+      this.joinKkylAct()
+    },
     //获取当前登录用户信息
     async getUserInfos() {
-      getUserInfoRequest()
+      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',
@@ -74,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
+      })
+    }
 
 
   }
@@ -106,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>
diff --git a/pages/my/register.vue b/pages/my/register.vue
index 6bc54e6..fa3d976 100644
--- a/pages/my/register.vue
+++ b/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,9 +120,10 @@ export default {
           data: this.formData
         }).then((res) => {
           if (res.code==200) {
-           uni.reLaunch({
-             url: '/pages/home/home'
-           })
+            getUserInfoRequest()
+             uni.reLaunch({
+               url: '/pages/home/home'
+             })
           } else {
             uni.showToast({
               title: res.msg,
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
index 0261131..3c01efc 100644
--- a/uni_modules/uni-icons/changelog.md
+++ b/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）
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
index 7da5356..a022173 100644
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -1,28 +1,20 @@
 <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">
-		<slot></slot>
-	</text>
+	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
 	<!-- #endif -->
 </template>
 
 <script>
-	import { fontData } from './uniicons_file_vue.js';
-
-	const getVal = (val) => {
-		const reg = /^[0-9]*$/g
-		return (typeof val === 'number' || reg.test(val)) ? val + 'px' : val;
-	}
-
+	import icons from './icons.js';
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
 	import iconUrl from './uniicons.ttf'
 	domModule.addRule('fontFace', {
 		'fontFamily': "uniicons",
-		'src': "url('" + iconUrl + "')"
+		'src': "url('"+iconUrl+"')"
 	});
 	// #endif
 
@@ -38,7 +30,7 @@
 	 */
 	export default {
 		name: 'UniIcons',
-		emits: ['click'],
+		emits:['click'],
 		props: {
 			type: {
 				type: String,
@@ -52,36 +44,23 @@
 				type: [Number, String],
 				default: 16
 			},
-			customPrefix: {
-				type: String,
-				default: ''
-			},
-			fontFamily: {
+			customPrefix:{
 				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
+		computed:{
+			unicode(){
+				let code = this.icons.find(v=>v.font_class === this.type)
+				if(code){
+					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>
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
index 0a6b6fe..2f56eab 100644
--- a/uni_modules/uni-icons/components/uni-icons/uniicons.css
+++ b/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 {
-  content: "\e6d1";
-}
-
-.uniui-down:before {
-  content: "\e6b8";
+.uniui-arrowthindown:before {
+  content: "\e6be";
 }
 
 .uniui-bottom:before {
   content: "\e6b8";
 }
 
-.uniui-arrowright:before {
-  content: "\e6d5";
+.uniui-arrowdown:before {
+  content: "\e6b8";
 }
 
 .uniui-right:before {
   content: "\e6b5";
 }
 
-.uniui-up:before {
-  content: "\e6b6";
+.uniui-arrowright:before {
+  content: "\e6b5";
 }
 
 .uniui-top:before {
   content: "\e6b6";
 }
 
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
 .uniui-left:before {
   content: "\e6b7";
 }
 
-.uniui-arrowup:before {
-  content: "\e6d6";
+.uniui-arrowleft:before {
+  content: "\e6b7";
 }
 
 .uniui-eye:before {
@@ -643,6 +638,10 @@
   content: "\e627";
 }
 
+.uniui-cart-filled:before {
+  content: "\e629";
+}
+
 .uniui-checkbox:before {
   content: "\e62b";
 }
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
index 14696d038d828073edac09ea4e5ba1dec2f58115..835f33bc9411461b8b9046b3fec742e921d6ce3a 100644
GIT binary patch
delta 3174
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
WG}d?b6t%2rZ*OjjT;5yCDEc4U`6v_s

delta 3270
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
NkM16_N1oeT@n2MfM_vE`

diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
index 6b681b4..26ea698 100644
--- a/uni_modules/uni-icons/package.json
+++ b/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",
@@ -16,7 +16,11 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-"dcloudext": {
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
     "sale": {
       "regular": {
         "price": "0.00"
@@ -33,8 +37,7 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
-    "type": "component-vue"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
     "dependencies": ["uni-scss"],
@@ -42,14 +45,12 @@
     "platforms": {
       "cloud": {
         "tcb": "y",
-        "aliyun": "y",
-        "alipay": "n"
+        "aliyun": "y"
       },
       "client": {
         "App": {
           "app-vue": "y",
-          "app-nvue": "y",
-          "app-uvue": "y"
+          "app-nvue": "y"
         },
         "H5-mobile": {
           "Safari": "y",
@@ -69,15 +70,11 @@
           "阿里": "y",
           "百度": "y",
           "字节跳动": "y",
-          "QQ": "y",
-					"钉钉": "y",
-					"快手": "y",
-					"飞书": "y",
-					"京东": "y"
+          "QQ": "y"
         },
         "快应用": {
-          "华为": "y",
-          "联盟": "y"
+          "华为": "u",
+          "联盟": "u"
         },
         "Vue": {
             "vue2": "y",
@@ -86,4 +83,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
index 040e7e5..511915d 100644
--- a/uni_modules/uni-popup/changelog.md
+++ b/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）
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index 08707d4..86e12cd 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/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"
-					:placeholder="placeholderText" :focus="focus">
+				<input class="uni-dialog-input" v-model="val" type="text" :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>
@@ -29,19 +28,16 @@
 <script>
 	import popup from '../uni-popup/popup.js'
 	import {
-		initVueI18n
+	initVueI18n
 	} from '@dcloudio/uni-i18n'
 	import messages from '../uni-popup/i18n/index.js'
-	const {
-		t
-	} = initVueI18n(messages)
+	const {	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: ''
@@ -109,26 +85,19 @@
 				type: Boolean,
 				default: false
 			},
-			cancelText: {
+			cancelText:{
 				type: String,
 				default: ''
 			},
-			confirmText: {
+			confirmText:{
 				type: String,
 				default: ''
-			},
-			maxlength: {
-				type: Number,
-				default: -1,
-			},
-			focus: {
-				type: Boolean,
-				default: true,
 			}
 		},
 		data() {
 			return {
 				dialogType: 'error',
+				focus: false,
 				val: ""
 			}
 		},
@@ -156,21 +125,7 @@
 				}
 			},
 			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
+				this.val = val
 			}
 		},
 		created() {
@@ -179,25 +134,25 @@
 			// this.popup.closeMask()
 			if (this.mode === 'input') {
 				this.dialogType = 'info'
-				this.val = this.value;
-				// #ifdef VUE3
-				this.val = this.modelValue;
-				// #endif
+				this.val = this.value
 			} else {
 				this.dialogType = this.type
 			}
 		},
+		mounted() {
+			this.focus = true
+		},
 		methods: {
 			/**
 			 * 点击确认按钮
 			 */
 			onOk() {
-				if (this.mode === 'input') {
+				if (this.mode === 'input'){
 					this.$emit('confirm', this.val)
-				} else {
+				}else{
 					this.$emit('confirm')
 				}
-				if (this.beforeClose) return
+				if(this.beforeClose) return
 				this.popup.close()
 			},
 			/**
@@ -205,17 +160,22 @@
 			 */
 			closeDialog() {
 				this.$emit('close')
-				if (this.beforeClose) return
+				if(this.beforeClose) return
 				this.popup.close()
 			},
-			close() {
+			close(){
 				this.popup.close()
 			}
 		}
 	}
 </script>
 
-<style lang="scss">
+<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 {
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
index f7e667c..5be7624 100644
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/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',
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
index f0b99e3..db90c59 100644
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/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,
-					borderRadius:this.borderRadius || "0"
+					backgroundColor: this.bg
 				}
 				// 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,
-					borderRadius:this.borderRadius || "0",
+					backgroundColor: this.bg
 				}
 				// 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.ani = ['zoom-out', 'fade']
 				this.transClass = {
 					position: 'fixed',
 					/* #ifndef APP-NVUE */
@@ -398,12 +372,12 @@
 					right: 0,
 					top: 0,
 					justifyContent: 'center',
-					alignItems: 'center',
-					borderRadius:this.borderRadius || "0"
+					alignItems: 'center'
 				}
 				// 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
-				})
+				this.showPopup = true
+				this.showTrans = true
 			}
 		}
 	}
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
index 0a4ebf7..6f5f72e 100644
--- a/uni_modules/uni-popup/package.json
+++ b/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",
-                "alipay": "n"
+				"aliyun": "y"
 			},
 			"client": {
 				"App": {
diff --git a/utils/common.js b/utils/common.js
index bf1e83e..5bb2a66 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -1,5 +1,5 @@
 import request from "@/utils/request";
-import {setUserInfo} from '@/utils/auth.js'
+import {setUserInfo,getUserInfo} from '@/utils/auth.js'
 /**
 * 显示消息提示框
 * @param content 提示的标题