Skip to content

Commit 7d0c07f

Browse files
wlxuquwlxuqu
committed
Merge branch 'yiruiwen' into dev
2 parents 5017be5 + aa4d501 commit 7d0c07f

File tree

20 files changed

+773
-321
lines changed

20 files changed

+773
-321
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水
1111

12-
### **欢迎加群交流反馈：1129077272**
12+
## [点击加群交流反馈：1129077272](https://qm.qq.com/cgi-bin/qm/qr?k=1FfucLpozYbnb7FWo_KsqAdEi1mE3Qrf&jump_from=webapi)
1313

1414
## 特性
1515

‎manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name" : "uView",
33
"appid" : "__UNI__60F4B81",
44
"description" : "多平台快速开发的UI框架",
5-
"versionName" : "1.6.6",
5+
"versionName" : "1.6.8",
66
"versionCode" : "100",
77
"transformPx" : false,
88
"app-plus" : {

‎pages.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"easycom": {
33
"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
44
},
5-
// "condition": { //模式配置，仅开发期间生效
6-
// "current": 0, //当前激活的模式(list 的索引项)
7-
// "list": [{
8-
// "name": "test", //模式名称
9-
// "path": "pages/componentsC/test/index", //启动页面，必选
10-
// "query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
11-
// }]
12-
// },
5+
"condition": { //模式配置，仅开发期间生效
6+
"current": 0, //当前激活的模式(list 的索引项)
7+
"list": [{
8+
"name": "test", //模式名称
9+
"path": "pages/componentsC/test/index", //启动页面，必选
10+
"query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
11+
}]
12+
},
1313
"pages": [
1414
// 演示-组件
1515
{

‎pages/componentsA/form/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</u-form-item>
2424
<u-form-item :label-position="labelPosition" label="结算方式" prop="payType" label-width="150">
2525
<u-radio-group v-model="radio" @change="radioGroupChange" :width="radioCheckWidth" :wrap="radioCheckWrap">
26-
<u-radio shape="circle" v-model="item.checked" v-for="(item, index) in radioList" :key="index" :name="item.name">{{ item.name }}</u-radio>
26+
<u-radio shape="circle" v-for="(item, index) in radioList" :key="index" :name="item.name">{{ item.name }}</u-radio>
2727
</u-radio-group>
2828
</u-form-item>
2929
<u-form-item :label-position="labelPosition" label="所在地区" prop="region" label-width="150">
@@ -44,7 +44,7 @@
4444
<u-switch v-model="model.remember" slot="right"></u-switch>
4545
</u-form-item>
4646
<u-form-item :label-position="labelPosition" label="上传图片" prop="photo" label-width="150">
47-
<u-upload width="160"></u-upload>
47+
<u-upload width="160" height="160"></u-upload>
4848
</u-form-item>
4949
</u-form>
5050
<view class="agreement">

‎pages/componentsB/upload/index.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
:percent="item.progress"></u-line-progress>
1515
</view>
1616
</view>
17-
<u-upload ref="uUpload" :custom-btn="customBtn" :show-upload-list="showUploadList" :action="action" :auto-upload="autoUpload" :file-list="fileList"
17+
<u-upload :before-remove="beforeRemove" ref="uUpload" :custom-btn="customBtn" :show-upload-list="showUploadList" :action="action" :auto-upload="autoUpload" :file-list="fileList"
1818
:show-progress="showProgress" :deletable="deletable" :max-count="maxCount" @on-list-change="onListChange">
1919
<view v-if="customBtn" slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
2020
<u-icon name="photo" size="60" :color="$u.color['lightColor']"></u-icon>
@@ -140,6 +140,9 @@
140140
// console.log('onListChange', lists);
141141
this.lists = lists;
142142
},
143+
beforeRemove(index, lists) {
144+
return true;
145+
}
143146
}
144147
}
145148
</script>

‎pages/componentsC/actionSheet/index.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
text: '朱颜辞镜花辞树',
3636
disabled: true
3737
}, {
38-
text: '正是江南好风景'
38+
text: '正是江南好风景',
39+
subText: '春江水暖鸭先知'
3940
}, {
4041
text: '落花时节又逢君'
4142
}],

0 commit comments

Comments
 (0)