@kaiyinchem/ky-uniui 1.0.48 → 1.1.0

package/components/ky-cell.vue

@@ -35,7 +35,7 @@
 					<view v-if="!right && isInput" class="opt-val opt-input">
 						<input
 							v-if="type === 'text'"
-							:placeholder="placeholder || `请输入${label}`"
+							:placeholder="placeholder || $t('inputTips') + label"
 							:disabled="disabled"
 						  :maxlength="maxlength"
 							type="text"
@@ -48,7 +48,7 @@
 						/>
 						<input
 							v-if="type === 'number'"
-							:placeholder="placeholder || `请输入${label}`"
+							:placeholder="placeholder || $t('inputTips') + label"
 							:disabled="disabled"
 						  :maxlength="maxlength"
 							type="number"
@@ -61,7 +61,7 @@
 						/>
 						<input
 							v-if="type === 'digit'"
-							:placeholder="placeholder || `请输入${label}`"
+							:placeholder="placeholder || $t('inputTips') + label"
 							:disabled="disabled"
 						  :maxlength="maxlength"
 							type="digit"
@@ -74,7 +74,7 @@
 						/>
 						<view v-if="type === 'textarea'" class="opt-textarea">
 							<textarea
-							  :placeholder="placeholder || `请输入${label}`"
+							  :placeholder="placeholder || $t('inputTips') + label"
 							  :disabled="disabled"
 							  :maxlength="maxlength"
 							  placeholder-class="input-placeholder"
@@ -97,7 +97,7 @@
 						style="width: 100%;"
 						@change="onDateChange"
 					>
-						<text class="opt-val">{{ content || placeholder || `请选择${label}` }}</text>
+						<text class="opt-val">{{ content || placeholder || $t('selectTips') + label }}</text>
 					</picker>
 					
 				</template>

package/components/ky-empty.vue

@@ -2,7 +2,7 @@
   <view class="ky-empty-wrap">
     <view class="ky-empty-box">
       <image v-if="icon" class="ky-empty-icon" src="/static/img/nodata.png"></image>
-      <text v-if="msg" class="ky-empty-msg">{{ msg }}</text>
+      <text v-if="errMsg" class="ky-empty-msg">{{ errMsg }}</text>
       <slot></slot>
     </view>
   </view>
@@ -17,14 +17,26 @@
       },
       msg: {
         type: String,
-        default: '暂无数据'
+        default: ''
       },
-    },
+    },
+		watch: {
+			msg(v) {
+				if (v) {
+					this.errMsg = this.msg
+				}
+			},
+		},
     data() {
-      return {
-
+      return {
+				errMsg: this.$t('noData')
       }
-    }
+    },
+		mounted() {
+			if (this.msg) {
+				this.errMsg = this.msg
+			}
+		},
   }
 </script>
 

package/components/ky-fetch.vue

@@ -23,7 +23,7 @@
 					<image v-else-if="loadState === -2" class="ky-fetch-err-img" src="@/static/img/request_error.png"></image>
 					<image v-else class="ky-fetch-err-img" src="@/static/img/network_error.png"></image>
 				</template>
-				<text class="ky-fetch-err-txt">{{ msg || noDataMsg || (loadState === -1 ? '暂无相关内容' : '加载失败，请点击重试') }}</text>
+				<text class="ky-fetch-err-txt">{{ msg || noDataMsg || (loadState === -1 ? $t('noData') : $t('loadFaild')) }}</text>
 			</view>
 			
 			<view v-if="$slots.nodata && loadState === -1" class="ky-fetch-error-tip">
@@ -115,7 +115,7 @@
 				},
 				data: {},
 				list: [],
-				tips: '没有更多了',
+				tips: this.$t('noMore'),
 				loadError: false,
 				loading: false,
 				isChangeCondition: false,
@@ -234,7 +234,7 @@
             this.noMore = this.list.length >= count
           }
 
-					this.tips = this.noMore ? '没有更多了' : '加载中...'
+					this.tips = this.noMore ? this.$t('noMore') : this.$t('loading')
 					
 					if (this.autoHideLoading) {
 						this.loadState = isNoData ? -1 : 1
@@ -256,7 +256,7 @@
 					if (e.code === 504) {
 						this.loadState = -3
 					}
-					this.tips = e.msg || '加载失败，请点击重试'
+					this.tips = e.msg || this.$t('loadFaild')
           this.msg = this.tips
 					this.loadError = true
           this.$emit('error', e)

package/components/ky-pop.vue

@@ -27,7 +27,7 @@
 
 					<!--通用头部-->
 					<view v-if="title" :class="{ noClose, 'white-bg': type === 'pop', txtLeft: titleAlign === 'left' }" class="pop-top">
-						<text v-if="showTopBtn" class="pop-close" @click="close">取消</text>
+						<text v-if="showTopBtn" class="pop-close" @click="close">{{ $t('cancel') }}</text>
 						<text class="pop-title">{{ title }}</text>
 						<text v-if="!noClose && !showTopBtn && position !== 'top'" class="pop-close iconfont" @click="close">&#xe634;</text>
 						<button v-if="!noClose && showTopBtn" :disabled="disabled" :class="{ disabled }" class="pop-top-btn" @click="confirm">{{ confirmText }}</button>
@@ -130,6 +130,8 @@
 </template>
 
 <script>
+	import i18n from '@/utils/i18n.js'
+	
 	export default {
 		emits: ['change', 'update:value', 'confirm', 'cancel', 'input'],
 		props: {
@@ -161,11 +163,11 @@
 			},
 			cancelText: {
 				type: String,
-				default: '取消',
+				default: i18n.global.t('cancel'),
 			},
 			confirmText: {
 				type: String,
-				default: '确定',
+				default: i18n.global.t('confirm'),
 			},
 			// 输入框类型
 			inputType: {
@@ -178,7 +180,7 @@
 			},
 			placeholder: {
 				type: String,
-				default: '请输入'
+				default: i18n.global.t('inputTips'),
 			},
 			width: {
 				type: String,
@@ -362,7 +364,7 @@
 			},
 			confirm() {
 				if (this.type === 'input' && this.inputVal === '') {
-					this.$toast('内容不能为空')
+					this.$toast(this.$t('noContentTips'))
 					return
 				}
 				this.$emit('confirm', this.type === 'input' ? this.inputVal : true)
@@ -465,6 +467,7 @@
 			align-items: center;
 			justify-content: space-between;
       border-bottom: 1px solid var(--border-1);
+			background: var(--bg-white);
 			.pop-top-btn {
 				padding: 0;
 				margin: 0;

package/components/ky-search-history.vue

@@ -17,7 +17,7 @@
 				  />
 				  <text v-if="str" class="iconfont gray-color ky-search-clear" @click.stop="handleClear">&#xe634;</text>
 				</view>
-				<ky-btn width="150rpx" height="75rpx" radius="0" size="small" @click="handleSearch">搜索</ky-btn>
+				<ky-btn width="150rpx" height="75rpx" radius="0" size="small" @click="handleSearch">{{ $t('search') }}</ky-btn>
 			</view>
 		</view>
 		<!-- #endif -->
@@ -26,7 +26,7 @@
 		<view v-if="historyList.length && state" class="ky-search-history-wrap white-bg">
 		  <view class="ky-search-history-main">
 		    <view class="ky-search-history-head">
-		      <text class="ky-search-history-title">搜索历史</text>
+		      <text class="ky-search-history-title">{{ $t('searchHistory') }}</text>
 		      <text class="iconfont" @click="clearHistory">&#xe614;</text>
 		    </view>
 		    <view class="ky-search-history-list">
@@ -42,6 +42,8 @@
 </template>
 
 <script>
+	import i18n from '@/utils/i18n.js'
+	
 	export default {
 		emits: ['select', 'search', 'update:keyword', 'update:visible'],
 		props: {
@@ -64,7 +66,7 @@
 			},
 			placeholder: {
 				type: String,
-				default: '请输入关键词'
+				default: i18n.global.t('inputTips')
 			},
 		},
 		data() {
@@ -138,7 +140,7 @@
 				}
 			},
 			clearHistory() {
-			  this.$confirm({ content: '确定清除全部历史吗？' }, (res) => {
+			  this.$confirm({ content: i18n.global.t('confirmClearHistory') }, (res) => {
 			    if (res.confirm) {
 			      this.historyList = []
 			      this.$db.set(this.keyStr, [])

package/components/ky-smscode.vue

@@ -5,17 +5,12 @@
 		type="text"
 		size="small"
 	>
-	{{ isGetCode ? `重发${countDownTime}s` : '获取验证码' }}
+		{{ isGetCode ? `${countDownTime}s` : $t('getVerifyCode') }} 
 	</ky-btn>
 </template>
 
 <script>
-  const code_type = {
-    login: '登录',
-    reg: '注册',
-    find: '找回密码',
-    change: '修改密码'
-  }
+
 	export default {
 		props: {
 			mobile: {
@@ -40,14 +35,14 @@
 				this.$db.del('isToLogin')
 				this.code = ''
 				if (!this.mobile || !/^1\d{10}$/.test(this.mobile)) {
-					this.$toast('请输入正确的手机号码')
+					this.$toast(this.$t('phoneTips'))
 					return;
 				}
 				try {
 					await this.$api.user.GetSmsCode(this.mobile)
 					this.isGetCode = true;
           this.is_success = true
-					this.$toast('验证码已发送')
+					this.$toast(this.$t('codeSendSuccess'))
 					this.timeInterval = setInterval(() => {
 						if (this.countDownTime === 0) {
 							clearInterval(this.timeInterval);

package/package.json

@@ -7,7 +7,7 @@
     "style"
   ],
   "description": "an uniapp ui",
-  "version": "1.0.48",
+  "version": "1.1.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/yezipi/ky-uniui.git"
@@ -25,6 +25,7 @@
   "scripts": {},
   "license": "ISC",
   "dependencies": {
-    "@dcloudio/uni-ui": "^1.4.28"
+    "@dcloudio/uni-ui": "^1.4.28",
+    "vue-i18n": "^9.13.1"
   }
 }

package/components/ky-nologin.vue

@@ -1,47 +0,0 @@
-<template>
-	<!--未登录遮罩-->
-	<view class="nologin-mask">
-		<view class="nologin-btn">
-			<slot></slot>
-			<text class="block ft-24 mb-12 gray-color">{{ msg }}</text>
-			<ky-btn size="mini" width="200rpx" round @click="$nav.push('Login')">去登录</ky-btn>
-		</view>
-	</view>
-	<!--end 未登录遮罩-->
-</template>
-
-<script>
-	export default {
-		props: {
-			msg: {
-				type: String,
-				default: ''
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.nologin-mask {
-		position: fixed;
-		z-index: 2;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		width: 100%;
-		height: 100%;
-		background: linear-gradient(to top, var(--color-white) 45%, rgba(var(--rgb-white), 0.25));
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.nologin-btn {
-			margin-top: 100rpx;
-			width: 480rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-		}
-	}
-</style>

package/components/ky-phone.vue

@@ -1,86 +0,0 @@
-<!--悬浮电话按钮 首页、推荐产品页，产品详情页）-->
-<template>
-  <view class="float-icon-box">
-    <view class="float-icon-wrap">
-      <view class="float-item" @click.stop="toPage('/pages/User/Feedback/Create')">
-        <text class="iconfont" style="font-size: 22rpx;">&#xe60e;</text>
-        <text class="iconname">建议</text>
-      </view>
-      <view class="float-item" @click.stop="callPhone">
-        <text v-if="noPhone" class="iconfont" >&#xe680;</text>
-        <text v-else class="iconfont">&#xe8ab;</text>
-        <text class="iconname">{{ !noPhone ? '客服' : '经纪人' }}</text>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-  import { useUserInfo, useToken } from '@/stores/index.js'
-	import config from '@/config.js'
-
-  export default {
-    data() {
-      return {}
-    },
-		computed: {
-			noPhone() {
-				return useUserInfo().value && useUserInfo().value.customerOwnerPhone
-			}
-		},
-    methods: {
-      callPhone() {
-				const user = useUserInfo().value
-        const phoneNumber = user.customerOwnerPhone || config.CONTACT
-        uni.makePhoneCall({ phoneNumber })
-      },
-
-      toPage(url) {
-        this.$nav.push(useToken().value ? url : '/pages/Login')
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .float-icon-box {
-    position: fixed;
-    bottom: calc(var(--window-bottom) + env(safe-area-inset-bottom) + 24rpx);
-    right: 24rpx;
-    z-index: 99;
-    width: 75rpx;
-  }
-  .float-icon-menu {
-    position: relative;
-    z-index: 1;
-  }
-  .float-item {
-    width: 100%;
-    height: 75rpx;
-    background: linear-gradient(to bottom, var(--color-light-primary), var(--color-primary));
-    box-shadow: 0 0 12rpx rgba(0,0,0,.2);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    border-radius: 50%;
-    margin-bottom: 24rpx;
-    &:active {
-      filter: contrast(2);
-    }
-    .iconfont {
-      display: block;
-      color: #f5f5f5;
-      font-size: 24rpx;
-    }
-    .iconname {
-      font-size: 14rpx;
-      color: #f5f5f5;
-      line-height: 10rpx;
-      margin-top: 8rpx;
-      /* #ifdef H5 */
-      transform: scale(0.7);
-      /* #endif */
-    }
-  }
-</style>

package/components/ky-price.vue

@@ -1,97 +0,0 @@
-<!--价格展示组件，2022-10-10-->
-<template>
-  <view class="ky-price-wrap">
-    <view v-if="Number(data.unitPrice) > 0 && Number(data.priceType) !== 3" class="ky-price-main">
-      <view class="ky-price-text price-color">
-        <text class="ky-price-symbol">￥</text>
-        <text :style="{ 'font-size': fontSize + 'rpx' }" class="ky-price-num">{{ data.unitPrice }}</text>
-        <text v-if="data.unitName || data.unit || data.skuUnitName" class="ky-price-name">/{{ data.unitName || data.unit || data.skuUnitName }}</text>
-      </view>
-      <view v-if="Number(data.priceTrend) < 0" class="ky-price-trend price-trend-down">
-        <text class="iconfont">&#xeb0a;</text>
-        <text>{{ data.priceTrend }}%</text>
-      </view>
-      <view v-if="Number(data.priceTrend) > 0" class="ky-price-trend price-trend-up">
-        <text class="iconfont">&#xeb0b;</text>
-        <text>{{ data.priceTrend }}%</text>
-      </view>
-      <view v-if="Number(data.priceTrend) === 0" class="ky-price-trend price-trend-none gray-color">
-        <text class="iconfont" style="transform: rotate(90deg);">&#xeb0b;</text>
-        <text>{{ data.priceTrend }}%</text>
-      </view>
-    </view>
-    <view
-      v-if="Number(data.unitPrice) <= 0 || Number(data.priceType) === 3"
-      :style="{ 'font-size': (fontSize * 0.8) + 'rpx' }"
-    >
-      <text v-if="Number(data.unitPrice) <= 0 && Number(data.priceType) !== 3" class="ky-price-invalid gray-color">暂无报价</text>
-      <text v-else class="ky-price-callphone price-color">来电询价</text>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    props: {
-      /**
-       * 价格对象data
-       * @property { Number } data.unitPrice 价格
-       */
-      data: {
-        type: Object,
-        default: () => {
-          return {
-            unitPrice: 0, // 单位价格
-            unitName: '', // 单位名称
-            priceTrend: NaN, // 价格涨跌，百分比
-            priceType: 0, // 价格类型，为3显示来电询价
-            skuUnitName: '',
-            unit: ''
-          }
-        }
-      },
-      fontSize: {
-        type: Number,
-        default: 28
-      }
-    },
-    data() {
-      return {
-
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .ky-price-wrap {
-    display: flex;
-    align-items: center;
-    .ky-price-main {
-      display: flex;
-      align-items: center;
-      .ky-price-num {
-        font-weight: bold;
-        font-size: 32rpx;
-      }
-      .ky-price-name, .ky-price-symbol {
-        font-size: 24rpx;
-      }
-    }
-    .ky-price-trend {
-      display: flex;
-      align-items: center;
-      margin-left: 12rpx;
-      .iconfont {
-        display: inline-block;
-        margin-right: 12rpx;
-      }
-      &.price-trend-down {
-        color: #07d007;
-      }
-      &.price-trend-up {
-        color: #ff201c;
-      }
-    }
-  }
-</style>