@xtdev/xt-miniprogram-ui 1.0.12 → 1.0.14

package/libs/xt-button/README.md

@@ -0,0 +1,60 @@
+# Icon图标
+
+### 介绍
+按钮用于触发一个操作
+
+###效果图
+![效果图](https://img.tanjiu.cn/home/eRzWjCbMsFbr6knYRcF2npEcjHAXEYFQ.png "Button效果图")
+
+### 引入
+在app.json或页面配置json中引入
+```
+"usingComponents": {
+    "xt-button": "@xtdev/xt-miniprogram-ui/xt-button",
+}
+```
+
+## 代码演示
+
+### 基础用法
+
+```
+    <xt-button type="main">默认状态</xt-button>
+```
+
+##API
+
+####xt-button props
+
+| 参数         | 说明        |  类型      |  默认值        |
+| ----------- | ----------- | ---------- | ------------  |
+| type      | 按钮类型，可选值为 `main` `secondary` | string |  `secondary`
+| size      | 按钮尺寸，可选值为 `normal` `large` `small` | string | `normal`
+| icon      | 左侧图标名称                          | string |
+| disabled  | 是否禁用按钮                      | boolean | `false`
+| open-type      | 微信开放能力，具体支持可参考[微信官方文档](https://developers.weixin.qq.com/miniprogram/dev/component/button.html) | string |
+| app-parameter      | 打开 APP 时，向 APP 传递的参数 | string |    
+| lang      | 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文 | string |    `en`
+| session-from      | 会话来源 | string |    
+| business-id      | 客服消息子商户 id | number |    
+| send-message-title      | 会话内消息卡片标题 | string |  当前标题  
+| send-message-path      | 会话内消息卡片点击跳转小程序路径 | string |    当前分享路径
+| send-message-img      | sendMessageImg | string |    截图
+| show-message-card     | 显示会话内消息卡片 | string |   `false`
+| dataset      | 按钮 dataset，open-type 为 share 时，可在 onShareAppMessage 事件的 `event.target.dataset.detail` 中看到传入的值 | any |    
+
+
+
+####Events
+
+| 事件名            | 说明          |  回调参数               |
+| ---------------- | ------------- | ---------------------- |
+| bind:click      | 点击按钮，且按钮状态不为加载或禁用时触发 | 
+| bind:getuserinfo      | 用户点击该按钮时，会返回获取到的用户信息，
+从返回参数的 detail 中获取到的值同 wx.getUserInfo |
+| bind:contact      | 客服消息回调 | 
+| bind:getphonenumber      | 获取用户手机号回调 | 
+| bind:getrealtimephonenumber       | 获取手机号实时验证回调，open-type=getRealtimePhoneNumber 时有效 |
+| bind:error      | 当使用开放能力时，发生错误的回调 | 
+| bind:opensetting      | 在打开授权设置页后回调 | 
+| bind:chooseavatar      | 当 open-type 的值为 chooseAvatar 时，选择头像之后的回调 | 

package/libs/xt-button/index.js

@@ -18,15 +18,46 @@ Component({
 			type: String,
 			value: "secondary",
 		},
-		color: {
-			type: String,
-		},
 		disabled: {
 			type: Boolean,
 			value: false,
 		},
-		customClass: {
+		dataset: null,
+		openType: {
+			type: String,
+			value: "",
+		},
+		appParameter: {
+			type: String,
+			value: "",
+		},
+		showMessageCard: {
+			type: String,
+			value: "",
+		},
+		sendMessagePath: {
+			type: String,
+			value: "",
+		},
+		sendMessageTitle: {
+			type: String,
+			value: "",
+		},
+		lang: {
+			type: String,
+			value: "en",
+		},
+		appParameter: {
 			type: String,
+			value: "",
+		},
+		appParameter: {
+			type: String,
+			value: "",
+		},
+		appParameter: {
+			type: String,
+			value: "",
 		},
 	},
 
@@ -34,10 +65,15 @@ Component({
 	 * 组件的初始数据
 	 */
 	data: {
-		sizeObj: {
-			small: { iconSize: 40 },
-			normal: { iconSize: 48 },
-			large: { iconSize: 48 },
+		iconSizeObj: {
+			small: 32,
+			normal: 40,
+			large: 48,
+		},
+		iconRightObj: {
+			small: 4,
+			normal: 8,
+			large: 16,
 		},
 	},
 
@@ -46,7 +82,35 @@ Component({
 	 */
 	methods: {
 		onClick(event) {
+			const { disabled } = this.properties;
+			if (disabled) {
+				return;
+			}
 			this.triggerEvent("click", event);
 		},
+		onGetUserInfo(event) {
+			this.triggerEvent("getuserinfo", event.detail);
+		},
+		onContact(event) {
+			this.triggerEvent("contract", event.detail);
+		},
+		onGetPhoneNumber(event) {
+			this.triggerEvent("getphonenumber", event.detail);
+		},
+		onGetrealtimephonenumber(event) {
+			this.triggerEvent("getphonenumber", event.detail);
+		},
+		onError(event) {
+			this.triggerEvent("error", event.detail);
+		},
+		onLaunchApp(event) {
+			this.triggerEvent("launchapp", event.detail);
+		},
+		onOpenSetting(event) {
+			this.triggerEvent("opensetting", event.detail);
+		},
+		onChooseAvatar(event) {
+			this.triggerEvent("chooseavatar", event.detail);
+		},
 	},
 });

package/libs/xt-button/index.wxml

@@ -1,7 +1,29 @@
 <!-- src/xt-button/index.wxml -->
 <view class="xt-button">
-  <button disabled="{{disabled}}" class="xt-button-{{size}} xt-button-{{type}} {{disabled ? 'xt-button-disabled-'+type : ''}}" hover-class="xt-button-{{type}}-clicked">
-    <xt-icon wx:if="{{icon}}" icon="{{icon}}" size="{{sizeObj[size].iconSize}}" class="xt-buttion-icon-{{size}}"></xt-icon>
+  <button 
+    disabled="{{ disabled }}"
+    bindtap="onClick" 
+    class="xt-button-{{size}} xt-button-{{type}} {{disabled ? 'xt-button-disabled-'+type : ''}}" 
+    hover-class="xt-button-{{type}}-clicked" 
+    open-type="{{ openType }}"
+    business-id="{{ businessId }}" 
+    session-from="{{ sessionFrom }}" 
+    send-message-title="{{ sendMessageTitle }}" 
+    send-message-path="{{ sendMessagePath }}" 
+    send-message-img="{{ sendMessageImg }}" 
+    show-message-card="{{ showMessageCard }}" 
+    app-parameter="{{ appParameter }}" 
+    data-detail="{{ dataset }}" 
+    bindgetuserinfo="onGetUserInfo" 
+    bindcontact="onContact" 
+    bindgetphonenumber="onGetPhoneNumber" 
+    bindgetrealtimephonenumber="getrealtimephonenumber"
+    binderror="onError" 
+    bindlaunchapp="onLaunchApp" 
+    bindopensetting="onOpenSetting" 
+    bindchooseavatar="onChooseAvatar"
+  >
+    <xt-icon wx:if="{{icon}}" icon="{{icon}}" size="{{iconSizeObj[size]}}" style="margin-right: {{iconRightObj[size]}}rpx"></xt-icon>
     <view>
       <slot />
     </view>

package/libs/xt-button/index.wxss

@@ -3,8 +3,9 @@
   display        : flex;
   align-items    : center;
   justify-content: center;
+  text-align: center;
   border-radius  : 120rpx;
-  box-sizing     : border-box;
+  box-sizing     : border-box !important;
   font-family    : PingFang SC-Semibold,
     PingFang SC;
   font-weight: 800;
@@ -13,21 +14,26 @@
 }
 
 .xt-button-small {
-  padding    : 16rpx 32rpx;
+  padding    : 0 32rpx;
   font-size  : 34rpx;
   line-height: 48rpx;
+  height: 80rpx;
 }
 
 .xt-button-normal {
-  padding    : 20rpx 48rpx;
+  /* padding    : 20rpx 48rpx; */
+  padding : 0 48rpx;
   font-size  : 40rpx;
   line-height: 56rpx;
+  height: 96rpx;
 }
 
 .xt-button-large {
-  padding    : 24rpx 64rpx;
+  /* padding    : 24rpx 64rpx; */
+  padding : 0 64rpx;
   font-size  : 48rpx;
   line-height: 68rpx;
+  height: 116rpx;
 }
 
 .xt-button-main {
@@ -61,16 +67,4 @@
 .xt-button-secondary-clicked {
   background-color: #DDDDDD;
   border          : 2rpx #DDDDDD solid;
-}
-
-.xt-buttion-icon-small {
-  margin-right: 8rpx;
-}
-
-.xt-buttion-icon-normal {
-  margin-right: 16rpx;
-}
-
-.xt-buttion-icon-large {
-  margin-right: 16rpx;
 }

package/libs/xt-dialog/README.md

@@ -73,7 +73,7 @@
 <img src="https://img.tanjiu.cn/home/X2bAjz2FQc6mNewfhbNBQfHm6zTmfYzd.png" alt="输入样式" style="zoom:50%;" />
 
 ```html
-<xt-dialog type="inputText" show="{{showInputDialog}}" title="标题标题标题" message="" placeholder="请输入内容" confirmButtonText="确定" showCancelButton="{{true}}" cancelButtonText="取消" bind:inputConfirm="onInputConfirm" bind:cancel="onInputCancel"></xt-dialog>
+<xt-dialog type="inputText" show="{{showInputDialog}}" title="标题标题标题" message="" placeholder="请输入内容" confirmButtonText="确定" showCancelButton="{{true}}" cancelButtonText="取消" bind:confirm="onInputConfirm" bind:cancel="onInputCancel"></xt-dialog>
 ```
 
 ### 5 选择器样式
@@ -81,7 +81,7 @@
 <img src="https://img.tanjiu.cn/home/yKrCY5MnGFS3FcjJ6pJRz5fXmJEHrSay.png" alt="选择器样式" style="zoom:50%;" />
 
 ```html
-<xt-dialog type="choose" show="{{true}}" title="标题标题标题" chooiceItems="{{chooiceItems}}" confirmButtonText="确定" showCancelButton="{{true}}" cancelButtonText="取消" bind:chooseConfirm="onChooseConfirm" bind:cancel="onChooseCancel"></xt-dialog>
+<xt-dialog type="choose" show="{{true}}" title="标题标题标题" chooiceItems="{{chooiceItems}}" confirmButtonText="确定" showCancelButton="{{true}}" cancelButtonText="取消" bind:confirm="onChooseConfirm" bind:cancel="onChooseCancel"></xt-dialog>
 ```
 
 #### 1）常规情况下的 chooiceItems 参数
@@ -142,7 +142,12 @@ chooiceItems:[
 | label  | 选项的文本描述 | String                  |
 | remark | 选项的辅助信息 | String                  |
 
+### Events
 
+| 事件         | 说明               | 回调参数     |
+| ------------ | ------------------ | ------------ |
+| bind:confirm | 点击确认按钮时触发 | event.detail |
+| bind:ccancel | 点击取消按钮时触发 | -            |
 
 
 

package/libs/xt-dialog/index.js

@@ -103,7 +103,7 @@ Component({
         }
         // 输入样式
         if(confirmtype == 'inputDialog'){
-          this.triggerEvent('inputConfirm', this.data.inpVal)
+          this.triggerEvent('confirm', this.data.inpVal)
         }
         // 选择样式
         if(confirmtype == 'chooseDialog'){
@@ -115,7 +115,7 @@ Component({
             })
             return
           }
-          this.triggerEvent('chooseConfirm', this.data.curChoosedItemVal)
+          this.triggerEvent('confirm', this.data.curChoosedItemVal)
         }
       },
       // 点击取消按钮

package/libs/xt-icon/index.wxss

@@ -8,6 +8,7 @@
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
+  line-height: 1;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

package/libs/xt-toast/README.md

@@ -25,7 +25,7 @@
 ![默认toast](https://img.tanjiu.cn/home/Qwp2EcfHXEYDCfibTEXSwdBfW8trbND6.png)
 
 ```html
-<xt-toast type="nomal" duration="{{5000}}" message="已确认合同"></xt-toast>
+<xt-toast type="nomal" show="{{true}}" duration="{{5000}}" message="已确认合同"></xt-toast>
 ```
 
 ### 2）带跳转的提示
@@ -33,21 +33,21 @@
 ![带跳转到toast](https://img.tanjiu.cn/home/6Z7zNbakJzkjSAEpbyaykw5742DWAJQd.png)
 
 ```html
-<xt-toast type="navToast" top="{{60}}" message="哈喽早上好！支持跳转指定页面。哈喽早上好！支持跳转指定页面" navUrl="/template/list/index"></xt-toast>
+<xt-toast type="navToast" message="哈喽早上好！支持跳转指定页面。哈喽早上好！支持跳转指定页面" navUrl="/template/list/index"></xt-toast>
 ```
 
 ## API
 
 ### xt-toast props
 
-| 参数        | 说明                                                         | 类型   | 默认值 |
-| ----------- | ------------------------------------------------------------ | ------ | ------ |
-| type        | 指定组件的类型，可选值为`nomal` `navToast`                   | String | nomal  |
-| duration    | 展示时长(ms)，仅当type为'nomal'时有用                        | Number | 5000   |
-| message     | 内容                                                         | String | ''     |
-| navDuration | 展示时长(ms)，仅当type为'navToast'时有用，（若不设置，则永远不会消失，直到用户点击跳转到指定页面） | Number | null   |
-| top         | 距离页面顶部高度(px)，仅当type为'navToast'时有用             | Number | 60     |
-| navUrl      | 指定跳转的页面路径（相对路径），仅当type为'navToast'时有用   | String | null   |
+| 参数        | 说明                                                         | 类型    | 默认值 |
+| ----------- | ------------------------------------------------------------ | ------- | ------ |
+| show        | 用于触发组件显示，仅当type为'nomal'时有用                    | Boolean | false  |
+| type        | 指定组件的类型，可选值为`nomal` `navToast`                   | String  | nomal  |
+| duration    | 展示时长(ms)，仅当type为'nomal'时有用                        | Number  | 5000   |
+| message     | 内容                                                         | String  | ''     |
+| navDuration | 展示时长(ms)，仅当type为'navToast'时有用，（若不设置，则永远不会消失，直到用户点击跳转到指定页面） | Number  | null   |
+| navUrl      | 指定跳转的页面路径（相对路径），仅当type为'navToast'时有用   | String  | null   |
 
 
 

package/libs/xt-toast/index.js

@@ -4,6 +4,10 @@ Component({
      * 组件的属性列表
      */
     properties: {
+      show:{
+        type:Boolean,
+        value:false
+      },
       type:{
         type:String,
         value:'nomal'
@@ -20,10 +24,6 @@ Component({
         type:Number,
         value:null
       },
-      top:{
-        type:Number,
-        value:60
-      },
       navUrl:{
         type:String,
         value:null
@@ -37,9 +37,16 @@ Component({
       // 带跳转的toast是否允许自动消失
       dispear: false
     },
+    observers:{
+      show(val){
+        if(val){
+          this.showToast();
+        }
+      }
+    },
     lifetimes:{
       attached(){
-        if(this.properties.type == 'nomal') this.showToast();
+        // if(this.properties.type == 'nomal') this.showToast();
         if(this.properties.type == 'navToast') this.showNavToast();
       }
     },
@@ -49,6 +56,7 @@ Component({
     methods: {
       // 常规toast
       showToast(){
+        console.log('查看变量',this.properties.show);
         wx.showToast({
           title: this.properties.message,
           duration: this.properties.duration,

package/libs/xt-toast/index.wxml

@@ -1,7 +1,6 @@
 <!--src/xt-toast/index.wxml-->
 <!-- 带跳转的提示 -->
-<view class="nav_toast_box" wx:if="{{type === 'navToast'}}" style="top: {{top*2}}rpx; {{dispear?'opacity: 0;':''}}" catchtap="navTo">
+<view class="nav_toast_box" wx:if="{{type === 'navToast'}}" style="{{dispear?'opacity: 0;':''}}" catchtap="navTo">
   <view class="nav_toast_text">{{message}}</view>
-   <!-- <image class="nav_icon" src="https://img.tanjiu.cn/home/5cQHhXZTCsjaXxtJR6SBi4zHHAFAw5ZN.png"></image> -->
    <xt-icon class="nav_icon" slot="right-icon" icon="arrow" size="32"></xt-icon>
 </view>

package/libs/xt-toast/index.wxss

@@ -1,8 +1,9 @@
 /* src/xt-toast/index.wxss */
 .nav_toast_box{
-  position: absolute;
-  left: 50%;
-  margin-left: -351rpx;
+  /* position: absolute; */
+  /* left: 50%; */
+  /* margin-left: -351rpx; */
+  width: 100%;
   display: flex;
   align-items: center;
   justify-content: space-between;

package/libs/xt-uploader/README.md

@@ -24,17 +24,18 @@
 
 ##API
 
-####xt-tag props
-
-| 参数      | 说明 |  类型 |
-| ----------- | ----------- | ---------- |
-| fileList      | 图片列表，必传，受控组件 | `Array<String>` |
-| title      | 表单标题 | `String` |
-| max      | 上传最大值，默认为9 | `Number` |
-| uploadDesc      | 上传文案说明 | `String` |
-| customUpload      | 是否自定义上传,true 点击盒子触发upload | `Boolean` |
-| disabled   | 是否禁用，禁用时不能删除和上传,可预览  | `Boolean` |
-| sourceType   | 照片来源  | ["album", "camera"] |
+####xt-uploader props
+
+| 参数        | 说明         |  类型      |  默认值
+| ----------- | ----------- | ---------- |  --------  |
+| fileList      | 图片列表，必传，受控组件 | Array<String> | `[]`
+| title      | 表单标题 | string |
+| max      | 上传最大值，每次可选照片数，默认为9 | number | 9
+| upload-desc      | 上传文案说明 | `String` |
+| custom-upload      | 是否自定义上传,true 点击盒子触发upload | boolean | `false`
+| disabled   | 是否禁用，禁用时不能删除和上传,可预览  | boolean |  `false`
+| sourceType   | 照片来源  | `Array<String>` | ["album", "camera"]
+| upload-api   | 组件库放公网，上传接口api，必传  | {url: 'https://...',fileDir: 'microComponents'} |
 
 ####Events
 
@@ -42,3 +43,4 @@
 | ---------------- | ------------- | ---------------------- |
 | bind:upload      | 上传成功后触发，如果customUpload为true则点击上传及触发 | fileList:图片列表, url：当前上传图片地址 |
 | bind:delete      | 删除成功后触发 | fileList:图片列表, url：当前删除图片地址，index：当前删除图片索引 |
+| bind:error      | 上传失败后触发 | errMsg: 失败原因 |

package/libs/xt-uploader/index.js

@@ -1,5 +1,5 @@
 // src/xt-uploader/index.js
-import utils from "./utils";
+const utils = require("./utils");
 Component({
 	/**
 	 * 组件的属性列表
@@ -24,7 +24,7 @@ Component({
 		// ["album", "camera"]
 		sourceType: {
 			type: Array,
-			value: ["camera"],
+			value: ["album", "camera"],
 		},
 		customUpload: {
 			type: Boolean,
@@ -34,6 +34,10 @@ Component({
 			type: Boolean,
 			value: false,
 		},
+		uploadApi: {
+			type: Object,
+			value: {},
+		},
 	},
 
 	/**
@@ -66,85 +70,129 @@ Component({
 			});
 		},
 		// 上传成功
-		onUploadSuccess(url) {
-			this.triggerEvent("upload", { fileList: this.properties.fileList, url });
+		onUploadSuccess(files, url) {
+			this.triggerEvent("upload", { fileList: files, url });
+		},
+		// 上传失败
+		onUploadError(errMsg) {
+			this.triggerEvent("error", { errMsg });
 		},
 		// 点击上传
 		startTakePhoto() {
 			const _this = this;
-			if (this.properties.customUpload) {
+			const { customUpload, uploadApi, max, sourceType, fileList } =
+				this.properties;
+			if (customUpload) {
 				this.triggerEvent("upload", {});
 				return;
 			}
+			if (!uploadApi || !uploadApi.url) {
+				wx.showToast({
+					title: "请传入上传接口",
+					icon: "error",
+				});
+				return;
+			}
 			wx.chooseMedia({
-				count: 1,
+				count: max - fileList.length,
 				mediaType: ["image"],
 				sizeType: ["compressed"],
-				sourceType: this.properties.sourceType,
+				sourceType,
 				success(res) {
 					console.log(res, "0000");
 					// tempFilePath可以作为img标签的src属性显示图片
-					const tempFilePaths = res.tempFiles[0].tempFilePath;
-					_this.uploadImage_v(tempFilePaths);
+					const tempFilePaths = res.tempFiles;
+					if (Array.isArray(tempFilePaths) && tempFilePaths.length) {
+						Promise.allSettled(
+							tempFilePaths.map((temp) =>
+								_this.uploadImage_v(temp.tempFilePath)
+							)
+						).then((uploadRes) => {
+							wx.hideLoading();
+							console.log("----uploadRes", uploadRes);
+							// 上传成功
+							const successUrls = uploadRes
+								.filter((result) => result.status == "fulfilled")
+								.map((result) => result.value);
+							if (successUrls.length) {
+								const files = fileList.concat(successUrls);
+								_this.onUploadSuccess(files, successUrls);
+							}
+							// 上传失败
+							const errorList = uploadRes.filter(
+								(result) => result.status == "rejected"
+							);
+							if (errorList.length) {
+								_this.onUploadError(errorList[0].value);
+							}
+						});
+					}
 				},
 				fail(error) {
-					wx.showToast({
-						title: error?.errMsg,
-						icon: "none",
-					});
+					_this.onUploadError(error && error.errMsg);
+					console.log("-----选取失败", error && error.errMsg);
 				},
 			});
 		},
 		// 上传文件
 		uploadImage_v(filePaths) {
-			let _this = this;
-			const { fileList } = _this.properties;
-			wx.showLoading("图片上传中");
-			utils.newHttp(
-				"/core/file/oss/miniProgramPolicy",
-				"GET",
-				{
-					dir: "microComponents",
-				},
-				(res) => {
-					const { host, signature, accessKeyId, policy, dir } = res.data;
-					let path = filePaths;
-					let name = utils.random_string(32) + utils.get_suffix(path);
-					wx.uploadFile({
-						url: host,
-						filePath: filePaths,
-						name: "file",
-						formData: {
-							key: dir + "/" + name,
-							policy,
-							success_action_status: "200",
-							OSSAccessKeyId: accessKeyId,
-							signature,
-						},
-						header: {
-							"Content-Type": "multipart/form-data",
-							"wow-token": "c9fbecb5fdeecb78e8745db9225d88e1",
-						},
-						success: (res) => {
-							if (res.statusCode == 200) {
-								let url = host + dir + "/" + name;
-								fileList.push(url);
-								_this.onUploadSuccess(url);
-								wx.showToast({
-									icon: "success",
-									title: "上传成功",
-								});
-							}
-						},
-						fail: (err) => {
-							wx.showToast({
-								icon: "error",
-								title: err.errMsg || "网络错误，请重试",
+			return new Promise((resolve, reject) => {
+				const { url, fileDir, ...header } = this.properties.uploadApi;
+				wx.showLoading("上传中");
+				utils.newHttp(
+					url,
+					"GET",
+					{
+						dir: fileDir || "microComponents",
+					},
+					header,
+					(res) => {
+						const { host, signature, accessKeyId, policy, dir } = res.data;
+						if (host) {
+							let path = filePaths;
+							let name = utils.random_string(32) + utils.get_suffix(path);
+							wx.uploadFile({
+								url: host,
+								filePath: filePaths,
+								name: "file",
+								formData: {
+									key: dir + "/" + name,
+									policy,
+									success_action_status: "200",
+									OSSAccessKeyId: accessKeyId,
+									signature,
+								},
+								header: {
+									"Content-Type": "multipart/form-data",
+								},
+								success: (res) => {
+									if (res.statusCode == 200) {
+										let url = host + dir + "/" + name;
+										resolve(url);
+										// fileList.push(url);
+										// _this.onUploadSuccess(url);
+										// wx.showToast({
+										// 	icon: "success",
+										// 	title: "上传成功",
+										// });
+									}
+								},
+								fail: (err) => {
+									reject(err.errMsg || "网络错误，请重试");
+									// _this.onUploadError(err.errMsg || "网络错误，请重试");
+									// wx.showToast({
+									// 	icon: "error",
+									// 	title: err.errMsg || "网络错误，请重试",
+									// });
+								},
 							});
-						},
-					});
-				}
-			);
+						} else {
+							reject(res.message);
+							// _this.onUploadError(res.message);
+						}
+					}
+				);
+			});
 		},
 	},
 });

package/libs/xt-uploader/index.json

@@ -1,5 +1,6 @@
 {
 	"component": true,
+	"styleIsolation": "isolated",
 	"usingComponents": {
 		"xt-icon": "../xt-icon/index"
 	}

package/libs/xt-uploader/index.wxml

@@ -4,9 +4,8 @@
   <view class="file_box">
     <view wx:for="{{fileList}}" wx:key="index" class="file_item">
       <image class="file_img" src="{{item}}" mode="aspectFit" bindtap="onPreviewImage" data-url="{{item}}" data-index="{{index}}" />
-      <view class="close_box" bindtap="onDelete" data-url="{{item}}" data-index="{{index}}" wx:if="{{!disabled}}">
-        <xt-icon icon="shanchu" size="48"></xt-icon>
-      </view>
+      <!-- 删除 -->
+      <xt-icon icon="shanchu" size="48" class="close_box" bindtap="onDelete" data-url="{{item}}" data-index="{{index}}" wx:if="{{!disabled}}"></xt-icon>
     </view>
     <view class="file_item" wx:if="{{!disabled && fileList.length<max}}" bindtap="startTakePhoto">
       <image src="https://img.tanjiu.cn/home/DDDsrH7PpNhneQsXGFmGGPcSM3QYXG8N.png" class="camera_icon" />

package/libs/xt-uploader/index.wxss

@@ -31,11 +31,12 @@
   justify-content : center;
   align-items     : center;
   background-color: #F5F5F5;
-  margin-bottom   : 32rpx;
+  margin-bottom   : 16rpx;
+  flex-shrink: 0;
 }
 
 .file_item:not(:last-child) {
-  margin-right: 32rpx;
+  margin-right: 16rpx;
 }
 
 .camera_icon {
@@ -49,10 +50,11 @@
 }
 
 .close_box {
-  position: absolute;
-  top     : 0;
-  right   : 0;
-  color   : rgba(0, 0, 0, 0.5);
+  position   : absolute;
+  line-height: 48rpx;
+  top        : 0;
+  right      : 0;
+  color      : rgba(0, 0, 0, 0.5);
 }
 
 .upload_desc {

package/libs/xt-uploader/utils.js

@@ -1,108 +1,13 @@
 // import md5 from "md5";
 
-function newhttpV1(url, method, params, callBack, header) {
-	var timestamp = Date.parse(new Date());
-	var date = new Date(timestamp);
-	//获取年份
-	var Y = date.getFullYear();
-	//获取月份
-	var M =
-		date.getMonth() + 1 < 10
-			? "0" + (date.getMonth() + 1)
-			: date.getMonth() + 1;
-	//获取当日日期
-	var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
-	var currentDate = Y + "-" + M + "-" + D;
-
-	//后端验证授权的字符串
-	var pass =
-		"MIIBOjANBgkqhkiG9w0BAQEFAAOCAScAMIIBIgKCARkA2a6BXaPViAbEvAPn3qtB" +
-		currentDate;
-
-	//change - gml  接口url拼接
-	var full_url = "https://gateway.tanjiu.cn" + url;
-	// 请求的唯一性
-	let onlySign = url + JSON.stringify(params);
-	if (getApp().hasQKey(onlySign)) {
-		return;
-	}
-	wx.request({
-		url: full_url,
-		method: method,
-		header: {
-			"content-type": "application/json",
-			// Authorization: md5(pass),
-			"ls-client-id": "TANJIUCLOUD_BUSINESS",
-			token: "openApi",
-			// xtoken: getApp().globalData?.xtoken,
-			"x-login-session": JSON.stringify({ userId: "2022199" }),
-			// xtoken: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjc0NDkwMjM1NjQ2MjMzODA0OCwicm5TdHIiOiJoT3ZoUVVxMjM3SUtDelpPN0dXb09jdnA2ZGdIV1g2byIsImF1dGhUb2tlbkJvIjp7Imd1aWQiOjc0NDkwMjM1NjQ2MjMzODA0OCwicGxhdGZvcm1Vc2VySWQiOjE1NTYwODA3ODE0Mjg1NzIxNiwiYXBwQ29kZSI6IlRBTl9TQUxFU01BTiIsInBsYXRmb3JtQ2xpZW50VHlwZSI6IldFQ0hBVF9BUFBMRVRTIiwicGxhdGZvcm1DbGllbnRDb2RlIjoiV0VDSEFUX0FQUExFVFNfVEFOX1NBTEVTTUFOIiwid2VhdmVyVXNlck5hbWUiOiJlbnRlcnByaXNlX3dlY2hhdF8zNl94dXp1byIsInRlbmFudElkIjoxLCJlbnYiOiJ0ZXN0In0sIm9wZW5pZCI6Im9mODFMNU9jVGduMHNnRDBKQlpTZFpRcnZ4ZlEiLCJ1bmlvbmlkIjoib3BVLUQwb1E4RjBQUTY0NnpSREpIRG1sMzJMQSIsImlhdCI6MTY3NjQ1MzQ1OTE3NiwiZXhwIjoxNjc3MDU4MjU5MTc2LCJ0b2tlbklkIjoiZmQ0M2U0MjIxYjJjNDVkN2EyYWJhNTdkZTNhNGY1NmEifQ.weXKWnX7sWmL7f1s2a2MuOKZd5Yw8elzrG824JY0R-4',
-			...header,
-		},
-		data: params,
-		success(res) {
-			if (res.data) {
-				var result = {
-					data: res.data.data,
-					message: res.data.message || res.data.errMsg,
-					code:
-						res.data.code ||
-						res.data.errCode ||
-						(res.data.code === 0 || res.data.errCode == 0 ? 0 : null),
-				};
-				callBack(result);
-			}
-		},
-		fail(err) {
-			var result = {
-				success: false,
-				data: {},
-				message: err.errMsg || err.msg || err.message,
-			};
-			wx.showToast({
-				title: esult.message || "请检查网络是否通畅，稍后重试！",
-				icon: "none",
-			});
-			console.log("err = ", err);
-			callBack(result);
-		},
-		complete() {
-			getApp().delQKey(onlySign);
-		},
-	});
-	getApp().createQKey(onlySign);
-}
-
-function newhttpRequest(url, method, params, callBack, header) {
-	var timestamp = Date.parse(new Date());
-	var date = new Date(timestamp);
-	//获取年份
-	var Y = date.getFullYear();
-	//获取月份
-	var M =
-		date.getMonth() + 1 < 10
-			? "0" + (date.getMonth() + 1)
-			: date.getMonth() + 1;
-	//获取当日日期
-	var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
-	var currentDate = Y + "-" + M + "-" + D;
-
-	//后端验证授权的字符串
-	var pass =
-		"MIIBOjANBgkqhkiG9w0BAQEFAAOCAScAMIIBIgKCARkA2a6BXaPViAbEvAPn3qtB" +
-		currentDate;
-
-	//change - gml  接口url拼接
-	var full_url = "https://gateway.tanjiu.cn" + url;
+function newhttpRequest(url, method, params, header, callBack) {
 	wx.request({
-		url: full_url,
+		url,
 		method: method,
 		header: {
 			"content-type": "application/json",
 			// Authorization: md5(pass),
-			"ls-client-id": "TANJIUCLOUD_BUSINESS",
 			token: "openApi",
-			"x-login-session": JSON.stringify({ userId: "2022199" }),
 			...header,
 		},
 		data: params,
@@ -126,7 +31,7 @@ function newhttpRequest(url, method, params, callBack, header) {
 				message: err.errMsg || err.msg,
 			};
 			wx.showToast({
-				title: esult.message || "请检查网络是否通畅，稍后重试！",
+				title: result.message || "请检查网络是否通畅，稍后重试！",
 				icon: "none",
 			});
 			console.log("err = ", err);
@@ -157,7 +62,7 @@ function get_suffix(filename) {
 	return suffix;
 }
 
-export default {
+module.exports = {
 	newHttp: newhttpRequest,
 	random_string,
 	get_suffix,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtdev/xt-miniprogram-ui",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "",
   "miniprogram": "libs",
   "publishConfig": {