liu

mallplus-admin/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883
-spring.profiles.active=dev
+#spring.profiles.active=dev
-#spring.profiles.active=test
+spring.profiles.active=test
 server.port=8085
 spring.jackson.time-zone=GMT+8
 

mallplus-portal/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java

@@ -3,6 +3,9 @@ package com.zscat.mallplus.build.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zscat.mallplus.build.entity.BuildWuyeCompany;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 服务类
@@ -14,4 +17,6 @@ import com.zscat.mallplus.build.entity.BuildWuyeCompany;
 public interface IBuildWuyeCompanyService extends IService<BuildWuyeCompany> {
 
     boolean saveCompany(BuildWuyeCompany entity);
+
+    Map<String, List<String>> nameMapWithCommunity();
 }

mallplus-portal/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java

@@ -53,4 +53,6 @@ public interface IBuildingCommunityService extends IService<BuildingCommunity> {
                                       double latitude,
                                        double longitude,
                                      Integer pageSize);
+
+    List<BuildingCommunity> listOfCompany(Long id);
 }

mallplus-portal/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java

@@ -1,9 +1,12 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildWuyeCompany;
+import com.zscat.mallplus.build.entity.BuildingCommunity;
 import com.zscat.mallplus.build.mapper.BuildWuyeCompanyMapper;
 import com.zscat.mallplus.build.service.IBuildWuyeCompanyService;
+import com.zscat.mallplus.build.service.IBuildingCommunityService;
 import com.zscat.mallplus.exception.ApiMallPlusException;
 import com.zscat.mallplus.sys.entity.SysUser;
 import com.zscat.mallplus.sys.entity.SysUserRole;
@@ -14,7 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Date;
+import java.util.*;
 
 /**
  * <p>
@@ -36,6 +39,9 @@ public class BuildWuyeCompanyServiceImpl extends ServiceImpl<BuildWuyeCompanyMap
     @Resource
     private SysUserRoleMapper userRoleMapper;
 
+    @Resource
+    private IBuildingCommunityService communityService;
+
     @Transactional
     @Override
     public boolean saveCompany(BuildWuyeCompany entity) {
@@ -67,4 +73,19 @@ public class BuildWuyeCompanyServiceImpl extends ServiceImpl<BuildWuyeCompanyMap
         userRoleMapper.insert(userRole);
         return true;
     }
+
+    @Override
+    public Map<String, List<String>> nameMapWithCommunity() {
+        Map<String, List<String>> map = new HashMap<>();
+        List<BuildWuyeCompany> comList = this.list(new QueryWrapper<>());
+        comList.forEach(company -> {
+            List<BuildingCommunity> list = communityService.listOfCompany(company.getId());
+            List<String> cList = new ArrayList<>();
+            list.forEach(community -> {
+                cList.add(community.getName());
+            });
+            map.put(company.getName(), cList);
+        });
+        return map;
+    }
 }

mallplus-portal/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java

@@ -169,8 +169,8 @@ public class BuildingCommunityServiceImpl extends ServiceImpl<BuildingCommunityM
         }
         buildAdvs = advMapper.selectList(new QueryWrapper<BuildAdv>().eq("community_id", community.getId()));
         buildNotices = noticeMapper.selectList(new QueryWrapper<BuildNotice>().eq("community_id", community.getId()));
-        if (Double.valueOf(community.getLatitude())>0){
+        if (Double.valueOf(community.getLatitude()) > 0) {
-            List<BuildingCommunity> communityList = this.selectNearCommunity(40,Double.valueOf(community.getLatitude()),Double.valueOf(community.getLongitude()),10);
+            List<BuildingCommunity> communityList = this.selectNearCommunity(40, Double.valueOf(community.getLatitude()), Double.valueOf(community.getLongitude()), 10);
             result.setCommunityList(communityList);
         }
         result.setCommunity(community);
@@ -182,7 +182,14 @@ public class BuildingCommunityServiceImpl extends ServiceImpl<BuildingCommunityM
 
     @Override
     public List<BuildingCommunity> selectNearCommunity(Integer distance, double latitude, double longitude, Integer pageSize) {
-        return communityMapper.selectNearCommunity(distance,latitude,longitude,pageSize);
+        return communityMapper.selectNearCommunity(distance, latitude, longitude, pageSize);
+    }
+
+    @Override
+    public List<BuildingCommunity> listOfCompany(Long companyId) {
+        QueryWrapper<BuildingCommunity> qw = new QueryWrapper<>();
+        qw.eq("company_id", companyId);
+        return baseMapper.selectList(qw);
     }
 
     public List<ActivityVo> getActivityList() {

mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeBuildController.java

@@ -32,6 +32,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Auther: shenzhuan
@@ -78,6 +79,15 @@ public class SingeBuildController extends ApiBaseAction {
         return new CommonResult().success(communityService.allCommunity());
     }
 
+    @SysLog(MODULE = "pms", REMARK = "物业及其社区")
+    @IgnoreAuth
+    @GetMapping(value = "/wuyeCompanyWithCommunity")
+    @ApiOperation(value = "物业及其社区")
+    public Object wuyeCompanyWithCommunity() {
+        Map<String, List<String>> map = IBuildWuyeCompanyService.nameMapWithCommunity();
+        return new CommonResult().success(map);
+    }
+
     @SysLog(MODULE = "pms", REMARK = "绑定小区和房间")
     @IgnoreAuth
     @PostMapping(value = "/bindCommunity")
@@ -188,6 +198,7 @@ public class SingeBuildController extends ApiBaseAction {
         }
         return new CommonResult().failed();
     }
+
     /**
      * @param entity
      * @param pageNum
@@ -206,6 +217,7 @@ public class SingeBuildController extends ApiBaseAction {
         }
         return new CommonResult().failed();
     }
+
     @SysLog(MODULE = "pms", REMARK = "查询团购商品列表")
     @IgnoreAuth
     @ApiOperation(value = "查询带团购商品列表")

mallplus-portal/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 spring.jackson.time-zone=GMT+8
 #\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883
-#spring.profiles.active=test
+spring.profiles.active=test
-spring.profiles.active=dev
+#spring.profiles.active=dev
 #===server start===
 server.port=8083
 #server.port=8111

mallplusui-uniapp-app/common/api.js

@@ -1,9 +1,9 @@
 import store from '../store/index';
 export default {
 	// qq 237524947 wx15d4269d3210863d
-	BASEURI: 'http://2xpk7t.natappfree.cc/api/',
+	// BASEURI: 'http://2xpk7t.natappfree.cc/api/',
-	// BASEURI: 'http://mall.yyundong.com/portalapi/api/',
+	BASEURI: 'http://mall.yyundong.com/portalapi/api/',
-	// BASEURI: 'http://www.yyundong.com:8083/api/',
+	// BASEURI: 'http://192.168.31.52:8083/api/',
 	ADMINURI: 'http://mall.yyundong.com/adminapi/',
 	ESURI: 'http://www.yyundong.com:8081/',
 	h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId  暂时测试用
@@ -92,6 +92,7 @@ export default {
 		bindCommunity: 'single/build/bindCommunity', // 绑定小区和房间
 		home: 'single/build/home', // 首页内容页信息展示
 		applyCommunity: 'single/build/applyCommunity', // 社区入驻
+		wuyeCompanyWithCommunity: 'single/build/wuyeCompanyWithCommunity', // 所在地及其取货点列表（物业公司及其社区列表）
 
 
 	},

mallplusui-uniapp-app/pagesU/address/addressManage.vue

@@ -1,40 +1,42 @@
 <template>
 	<view class="content">
-
 		<view class="row b-b">
 			<text class="tit">联系人</text>
-			<input class="input" type="text" v-model="addressData.name" placeholder="收货人姓名"
+			<input class="input" type="text" v-model="addressData.name" placeholder="收货人姓名" placeholder-class="placeholder" />
-				placeholder-class="placeholder" />
 		</view>
 		<view class="row b-b">
-			<text class="tit">手机号</text>
+			<view class="tit">手机号</view>
-			<input class="input" type="number" maxlength="11" v-model="addressData.phoneNumber" placeholder="收货人手机号码"
+			<input class="input" type="number" maxlength="11" v-model="addressData.phoneNumber" placeholder="收货人手机号码" placeholder-class="placeholder" />
-				placeholder-class="placeholder" />
 		</view>
 
-		<view class="row b-b">
+		<!-- 		<view class="row b-b">
-			<text class="tit">所在地</text>
+			<view class="tit">所在地</view>
 			<view class="input">
-				<w-select style="" v-model='chooseValue' defaultValue="请选择所在地" :list='range' width="100%"
+				<w-select style="" v-model="chooseValue" defaultValue="请选择所在地" :list="range" width="100%" valueName="content" @change="change"></w-select>
-					valueName='content' @change='change'>
+ -->
-				</w-select>
+		<!-- <uni-data-select :placeholder="addressData.region"  v-model="value" :localdata="range" @change="change"></uni-data-select> -->
-
+		<!-- 			</view>
-				<!-- <uni-data-select :placeholder="addressData.region"  v-model="value" :localdata="range" @change="change"></uni-data-select> -->
+		</view> -->
-			</view>
-
-		</view>
 		<!-- <view class="row b-b">
 			<text class="tit">地图:</text>
-
-
 			<input class="input" @click="openMap()" type="text" value="" v-model="mapAddressName"
 				placeholder="在地图上搜索并选择地址" disabled="true" />
 			<text class="yticon icon-shouhuodizhi"></text>
-
 		</view> -->
+		<!-- 		<view class="row b-b">
+			<view class="tit">取货点</view>
+			<view class="input">
+				<w-select style=""  v-model="chooseValueAddress" defaultValue="请选择取货点" :list="rangeAddress" width="100%" valueName="content" @change="changeAddress"></w-select>
+			</view>
+		</view> -->
+
 		<view class="row b-b">
-			<text class="tit">取货点</text>
+			<view class="tit">所在地</view>
-			<text class="input">王宫村服务站</text>
+			<view class="input"><uni-data-select v-model="valueszd" :localdata="rangeszd" @change="changeszd"></uni-data-select></view>
+		</view>
+		<view class="row b-b">
+			<view class="tit">取货点</view>
+			<view class="input"><uni-data-select v-model="valueqhd" :localdata="rangeqhd" @change="changeqhd"></uni-data-select></view>
 		</view>
 
 		<!-- <view class="row default-row">
@@ -46,218 +48,281 @@
 </template>
 
 <script>
-	import Api from '@/common/api';
+import Api from '@/common/api'
-	import lotusAddress from "@/components/Winglau14-lotusAddress/Winglau14-lotusAddress.vue"
+import lotusAddress from '@/components/Winglau14-lotusAddress/Winglau14-lotusAddress.vue'
-	export default {
+export default {
-		data() {
+	data() {
-			return {
+		return {
-				mapAddressName: '',
+			mapAddressName: '',
-				chooseValue: "",
+			addressData: {
-				addressData: {
+				name: '',
-					name: '',
+				phoneNumber: '',
-					phoneNumber: '',
+				province: '',
-					province: '',
+				city: '',
-					city: '',
+				region: '',
-					region: '',
+				detailAddress: '王宫村服务站',
-					detailAddress: '王宫村服务站',
+				defaultStatus: 1,
-					defaultStatus: 1,
+				def: false
-					def: false
+			},
+			lotusAddressData: {
+				visible: false,
+				provinceName: '',
+				cityName: '',
+				townName: ''
+			},
+			chooseValue: '',
+			range: [
+				{
+					content: '王宫村'
 				},
-				lotusAddressData: {
+				{
-					visible: false,
+					content: '土山村'
-					provinceName: '',
-					cityName: '',
-					townName: '',
 				},
-				value: 0,
+				{
-				range: [{
+					content: '马庄村'
-						id: 1,
+				}
-						content: '王宫村'
+			],
-					},
+			chooseValueAddress: '',
-					{
+			rangeAddress: [],
-						id: 2,
+			valueszd: '',
-						content: '土山村'
+			rangeszd: [
-					},
+				{
-					{
+					value: '王宫村',
-						id: 3,
+					text: '王宫村'
-						content: '马庄村'
+				},
+				{
+					value: '土山村',
+					text: '土山村'
+				},
+				{
+					value: '马庄村',
+					text: '马庄村'
+				}
+			],
+			valueqhd: '',
+			rangeqhd: [],
+			mapAddress: {}
+		}
+	},
+	onLoad(option) {
+		let title = '新增收货地址'
+		if (option.type === 'edit') {
+			title = '编辑收货地址'
+			this.addressData = JSON.parse(option.data)
+			this.addressData.postCode=''
+			this.addressData.province=''
+			this.addressData.city=''
+			this.addressData.areaId=''
+			this.addressData.longitude=''
+			this.addressData.latitude=''
+			this.valueszd = this.addressData.region
+			this.valueqhd = this.addressData.detailAddress
+		}
+		this.manageType = option.type
+		uni.setNavigationBarTitle({
+			title: title
+		})
+		this.initAddressData()
+	},
+	methods: {
+		initAddressData() {
+			let _this = this
+			Api.apiCall('get', Api.build.wuyeCompanyWithCommunity, {}).then(res => {
+				_this.mapAddress = res
+				_this.rangeszd = []
+				for (var name in res) {
+					_this.rangeszd.push({ value: name, text: name })
+				}
+				if (_this.manageType === 'edit') {
+					console.log('fFFFF',_this.addressData)
+					_this.valueszd = _this.addressData.region
+					_this.rangeqhd= []
+					for (var i in _this.mapAddress[_this.addressData.region]) {
+						_this.rangeqhd.push({ value: _this.mapAddress[_this.addressData.region][i], text: _this.mapAddress[_this.addressData.region][i] })
 					}
-				]
+					_this.valueqhd = _this.addressData.detailAddress
-			}
+				}				
-		},
-		onLoad(option) {
-			let title = '新增收货地址';
-			if (option.type === 'edit') {
-				title = '编辑收货地址'
-				this.addressData = JSON.parse(option.data)
-				this.chooseValue = JSON.parse(option.data).region
-				console.log('region》》》', this.addressData.region);
-				console.log('chooseValue》》》', this.chooseValue);
-			}
-			this.manageType = option.type;
-			uni.setNavigationBarTitle({
-				title:title
 			})
 		},
-		methods: {
+		change(res) {
-
+			console.log('res', res)
-			change(res) {
+			console.log('chooseValue', this.chooseValue)
-				console.log('res', res);
+			// let index = this.range.findIndex((item) => item.value == res)
-				// let index = this.range.findIndex((item) => item.value == res)
+			this.addressData.region = res.content
-				this.addressData.region= res.content
+			// this.chooseValue = res.content
-				this.chooseValue= res.content
+			console.log('region》》》', this.addressData.region)
-				console.log('region》》》', this.addressData.region);
+			console.log('chooseValue》》》', this.chooseValue)
-				console.log('chooseValue》》》', this.chooseValue);
+			this.rangeAddress = []
-			},
+			this.valueb = []
-
+			for (var i in this.mapAddress[res.content]) {
-			switchChange(e) {
+				this.rangeAddress.push({ content: this.mapAddress[res.content][i] })
-				this.addressData.defaultStatus = e.detail.value ? 1 : 0
+			}
-				this.addressData.def = e.detail.value
+			this.chooseValueAddress = null
-			},
-
-			openMap() {
-				var _this = this;
-				uni.chooseLocation({
-
-					success: function(res) {
-						console.log('res', res);
-
-						_this.addressData.latitude = res.latitude;
-						_this.addressData.longitude = res.longitude;
-						_this.mapAddressName = res.address + res.name;
-						_this.addressData.detailAddress = res.address + res.name;
-						console.log('经度：' + res.longitude);
-						console.log('详细地址：' + res.address);
-						console.log('纬度：' + res.latitude);
-					}
-				});
-
-			},
-			choseValue(res) {
-				//res数据源包括已选省市区与省市区code
-				this.lotusAddressData.visible = false; //visible为显示与关闭组件标识true显示false隐藏
-				if (res.isChose) {
-					console.log(res)
-					this.lotusAddressData.provinceName = res.provice; //省
-					this.lotusAddressData.cityName = res.city; //市
-					this.lotusAddressData.townName = res.town; //区
-
-					//赋值到addressData
-					this.addressData.province = res.provice
-					this.addressData.city = res.city
-					this.addressData.region = res.town
-
-				}
-			},
-
-			//提交
-			async confirm() {
-				const that = this
-				let data = this.addressData;
-				console.log('data》》》', data);
-				if (!data.name) {
-					this.$api.msg('请填写收货人姓名');
-					return;
-				}
-				if (!/^1[1-9][0-9]\d{8}$/.test(data.phoneNumber)) {
-					that.$api.msg('请输入正确的手机号码');
-					return
-				}
-				// if (!data.province) {
-				// 	that.$api.msg('请选择省市区');
-				// 	return
-				// }
-				// if (!data.city) {
-				// 	that.$api.msg('请选择二级城市')
-				// 	return
-				// }
-				if (!data.region) {
-					that.$api.msg('请选择所在的')
-					return
-				}
-				if (!data.detailAddress) {
-					that.$api.msg('请输入取货点');
-					return
-				}
-
-				let data1 = await Api.apiCall('post', Api.goods.addressSave, that.addressData);
-				if (data1) {
-					this.$api.msg(`保存成功`);
-					setTimeout(() => {
-						uni.navigateBack({
-							delta: 1
-						})
-
-					}, 800);
-				} else {
-					this.$api.msg(`保存失败`);
-				}
-
-
-			},
 		},
-		components: {
+		changeAddress(res) {
-			"lotus-address": lotusAddress
+			console.log('res', res)
+			// let index = this.range.findIndex((item) => item.value == res)
+			this.addressData.detailAddress = res.content
+			this.chooseValueAddress = res.content
+			console.log('regionxxx》》》', res.content)
 		},
+		changeszd(res) {
+			this.addressData.region = res
+			this.valueszd = res
+			this.rangeqhd= []
+			for (var i in this.mapAddress[res]) {
+				this.rangeqhd.push({ value: this.mapAddress[res][i], text: this.mapAddress[res][i] })
+			}
+			this.valueqhd = ''
+			this.addressData.detailAddress = ''
+		},
+		changeqhd(res) {
+			this.addressData.detailAddress = res
+			this.valueqhd = res
+		},
+
+		switchChange(e) {
+			this.addressData.defaultStatus = e.detail.value ? 1 : 0
+			this.addressData.def = e.detail.value
+		},
+
+		openMap() {
+			var _this = this
+			uni.chooseLocation({
+				success: function(res) {
+					console.log('res', res)
+
+					_this.addressData.latitude = res.latitude
+					_this.addressData.longitude = res.longitude
+					_this.mapAddressName = res.address + res.name
+					_this.addressData.detailAddress = res.address + res.name
+					console.log('经度：' + res.longitude)
+					console.log('详细地址：' + res.address)
+					console.log('纬度：' + res.latitude)
+				}
+			})
+		},
+		choseValue(res) {
+			//res数据源包括已选省市区与省市区code
+			this.lotusAddressData.visible = false //visible为显示与关闭组件标识true显示false隐藏
+			if (res.isChose) {
+				console.log(res)
+				this.lotusAddressData.provinceName = res.provice //省
+				this.lotusAddressData.cityName = res.city //市
+				this.lotusAddressData.townName = res.town //区
+
+				//赋值到addressData
+				this.addressData.province = res.provice
+				this.addressData.city = res.city
+				this.addressData.region = res.town
+			}
+		},
+
+		//提交
+		async confirm() {
+			const that = this
+			let data = this.addressData
+			console.log('data》》》', data)
+			if (!data.name) {
+				this.$api.msg('请填写收货人姓名')
+				return
+			}
+			if (!/^1[1-9][0-9]\d{8}$/.test(data.phoneNumber)) {
+				that.$api.msg('请输入正确的手机号码')
+				return
+			}
+			// if (!data.province) {
+			// 	that.$api.msg('请选择省市区');
+			// 	return
+			// }
+			// if (!data.city) {
+			// 	that.$api.msg('请选择二级城市')
+			// 	return
+			// }
+			if (!data.region) {
+				that.$api.msg('请选择所在地')
+				return
+			}
+			if (!data.detailAddress) {
+				that.$api.msg('请选择取货点')
+				return
+			}
+
+			let data1 = await Api.apiCall('post', Api.goods.addressSave, that.addressData)
+			if (data1) {
+				this.$api.msg(`保存成功`)
+				setTimeout(() => {
+					uni.navigateBack({
+						delta: 1
+					})
+				}, 800)
+			} else {
+				this.$api.msg(`保存失败`)
+			}
+		}
+	},
+	components: {
+		'lotus-address': lotusAddress
 	}
+}
 </script>
 
 <style lang="scss">
-	page {
+page {
-		background: $page-color-base;
+	background: $page-color-base;
-		padding-top: 16upx;
+	padding-top: 16upx;
+}
+
+.row {
+	display: flex;
+	align-items: center;
+	position: relative;
+	padding: 0 30upx;
+	height: 110upx;
+	background: #fff;
+
+	.tit {
+		flex-shrink: 0;
+		width: 120upx;
+		font-size: 30upx;
+		color: $font-color-dark;
 	}
 
-	.row {
+	.input {
-		display: flex;
+		flex: 1;
-		align-items: center;
+		font-size: 30upx;
-		position: relative;
+		color: $font-color-dark;
-		padding: 0 30upx;
-		height: 110upx;
-		background: #fff;
-
-		.tit {
-			flex-shrink: 0;
-			width: 120upx;
-			font-size: 30upx;
-			color: $font-color-dark;
-		}
-
-		.input {
-			flex: 1;
-			font-size: 30upx;
-			color: $font-color-dark;
-		}
-
-		.icon-shouhuodizhi {
-			font-size: 36upx;
-			color: $font-color-light;
-		}
 	}
 
-	.default-row {
+	.icon-shouhuodizhi {
-		margin-top: 16upx;
+		font-size: 36upx;
+		color: $font-color-light;
+	}
+}
 
-		.tit {
+.default-row {
-			flex: 1;
+	margin-top: 16upx;
-		}
 
-		switch {
+	.tit {
-			transform: translateX(16upx) scale(.9);
+		flex: 1;
-		}
 	}
 
-	.add-btn {
+	switch {
-		display: flex;
+		transform: translateX(16upx) scale(0.9);
-		align-items: center;
-		justify-content: center;
-		width: 690upx;
-		height: 80upx;
-		margin: 60upx auto;
-		font-size: $font-lg;
-		color: #fff;
-		background-color: $base-color;
-		border-radius: 10upx;
-		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
 	}
+}
+
+.add-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 690upx;
+	height: 80upx;
+	margin: 60upx auto;
+	font-size: $font-lg;
+	color: #fff;
+	background-color: $base-color;
+	border-radius: 10upx;
+	box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
 </style>

mallplusui-uniapp-app/uni_modules/uni-icons/changelog.md

@@ -0,0 +1,22 @@
+## 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）
+- 优化 兼容旧组件 type 值
+## 1.3.0（2021-11-19）
+- 新增 更多图标
+- 优化 自定义图标使用方式
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范

mallplusui-uniapp-app/uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -0,0 +1,96 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<!-- #endif -->
+</template>
+
+<script>
+	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'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('"+iconUrl+"')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons.glyphs
+			}
+		},
+		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)
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf') format('truetype');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+
+</style>

mallplusui-uniapp-app/uni_modules/uni-icons/components/uni-icons/uniicons.css

@@ -0,0 +1,663 @@
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  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-arrowthindown:before {
+  content: "\e6be";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowdown:before {
+  content: "\e6b8";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-arrowright:before {
+  content: "\e6b5";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowleft:before {
+  content: "\e6b7";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-cart-filled:before {
+  content: "\e629";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}

mallplusui-uniapp-app/uni_modules/uni-icons/package.json

@@ -0,0 +1,86 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.3.5",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

mallplusui-uniapp-app/uni_modules/uni-icons/readme.md

@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839