Pārlūkot izejas kodu

feat: 支持字体大小,自定义

lizhaocai 2 nedēļas atpakaļ
vecāks
revīzija
f2489f6108
100 mainītis faili ar 602 papildinājumiem un 952 dzēšanām
  1. 3 109
      README.md
  2. 74 125
      circlePages/addShare.vue
  3. 37 62
      circlePages/circle.vue
  4. 7 3
      components/basic-table/basic-table.vue
  5. 7 2
      components/w-select/w-select.vue
  6. 21 137
      minePages/set.vue
  7. 28 94
      pages/comm/comm.vue
  8. 11 6
      pages/comm/search.vue
  9. 9 4
      pages/comm/search2.vue
  10. 11 11
      pages/discovery/discovery.vue
  11. 13 24
      pages/home/home.vue
  12. 13 12
      pages/index/detail/detail.vue
  13. 12 10
      pages/index/index.vue
  14. 8 5
      pages/login/info.vue
  15. 12 10
      pages/login/login.vue
  16. 20 23
      pages/login/loginByCode.vue
  17. 11 7
      pages/mine/about.vue
  18. 10 15
      pages/mine/addFeed.vue
  19. 18 49
      pages/mine/coll.vue
  20. 12 36
      pages/mine/feedback.vue
  21. 91 33
      pages/mine/mine.vue
  22. 17 32
      pages/mine/need.vue
  23. 24 51
      pages/mine/share.vue
  24. 11 4
      tuniao-ui/components/tn-steps/tn-steps.vue
  25. 21 3
      uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
  26. 8 4
      uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
  27. 8 3
      uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
  28. 5 1
      uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
  29. 9 5
      uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/circlePages/addShare.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/circlePages/circle.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/basic-table/basic-table.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/w-select/w-select.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/minePages/set.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/comm/comm.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/comm/search.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/discovery/discovery.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/info.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/about.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/addFeed.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/coll.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/feedback.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  48. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/need.js.map
  49. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/share.js.map
  50. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-steps/tn-steps.js.map
  51. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  52. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  53. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  54. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  55. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map
  56. 1 1
      unpackage/dist/dev/mp-weixin/circlePages/addShare.js
  57. 2 1
      unpackage/dist/dev/mp-weixin/circlePages/addShare.json
  58. 1 1
      unpackage/dist/dev/mp-weixin/circlePages/addShare.wxml
  59. 1 1
      unpackage/dist/dev/mp-weixin/circlePages/circle.js
  60. 1 1
      unpackage/dist/dev/mp-weixin/circlePages/circle.json
  61. 1 1
      unpackage/dist/dev/mp-weixin/circlePages/circle.wxml
  62. 1 1
      unpackage/dist/dev/mp-weixin/common/runtime.js
  63. 1 1
      unpackage/dist/dev/mp-weixin/components/basic-table/basic-table.js
  64. 1 1
      unpackage/dist/dev/mp-weixin/components/basic-table/basic-table.wxml
  65. 1 1
      unpackage/dist/dev/mp-weixin/components/w-select/w-select.js
  66. 1 1
      unpackage/dist/dev/mp-weixin/components/w-select/w-select.wxml
  67. 1 1
      unpackage/dist/dev/mp-weixin/minePages/set.js
  68. 1 3
      unpackage/dist/dev/mp-weixin/minePages/set.json
  69. 1 1
      unpackage/dist/dev/mp-weixin/minePages/set.wxml
  70. 1 1
      unpackage/dist/dev/mp-weixin/pages/comm/comm.js
  71. 1 1
      unpackage/dist/dev/mp-weixin/pages/comm/comm.wxml
  72. 1 1
      unpackage/dist/dev/mp-weixin/pages/comm/search.js
  73. 1 1
      unpackage/dist/dev/mp-weixin/pages/comm/search.wxml
  74. 1 1
      unpackage/dist/dev/mp-weixin/pages/discovery/discovery.js
  75. 1 1
      unpackage/dist/dev/mp-weixin/pages/discovery/discovery.wxml
  76. 1 1
      unpackage/dist/dev/mp-weixin/pages/home/home.js
  77. 1 1
      unpackage/dist/dev/mp-weixin/pages/home/home.wxml
  78. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  79. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  80. 1 1
      unpackage/dist/dev/mp-weixin/pages/login/info.js
  81. 1 1
      unpackage/dist/dev/mp-weixin/pages/login/info.wxml
  82. 1 1
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  83. 1 1
      unpackage/dist/dev/mp-weixin/pages/login/login.wxml
  84. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/about.js
  85. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/about.wxml
  86. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/addFeed.js
  87. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/addFeed.wxml
  88. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/coll.js
  89. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/coll.wxml
  90. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/feedback.js
  91. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/feedback.wxml
  92. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/mine.js
  93. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml
  94. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/need.js
  95. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/need.wxml
  96. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/share.js
  97. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/share.wxml
  98. 1 1
      unpackage/dist/dev/mp-weixin/tuniao-ui/components/tn-steps/tn-steps.js
  99. 1 1
      unpackage/dist/dev/mp-weixin/tuniao-ui/components/tn-steps/tn-steps.wxml
  100. 0 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js

+ 3 - 109
README.md

@@ -1,115 +1,9 @@
 
 
-## 组件说明
+## 说明
 
-basic-table是基于uniapp开发的列表,参考element-ui设计api和参数,内置斑马纹,border,自定义列,宽度自动计算,合计等功能,现决定免费开源,如果对你有帮助,可给五星好评,如果需要作者帮助,可以给作者买一杯咖啡然后私聊作者
+sulibao-mini是基于uniapp开发的速立保小程序,参考tuniao-ui设计
 
-
-## 参数说明
-**basic-table组件**
-
-| 参数              | 说明                                 | 类型     | 可选值 | 默认值  |
-|-----------------|------------------------------------|--------|-----|------|
-| data | 显示的数据                                | array  | -   | -   |
-| columns | 表头数据                                | array  | -   | -   |
-| align          | 列表对齐方式                             | string | left/center/right   | left   |
-| height          | talbe的高度                             | string | -   | -   |
-| max-height          | 最大高度                             | string | -   | -   |
-| stripe          | 是否为斑马纹 table                             | boolean | true/false   | false   |
-| border          | 是否需要外边框                             | boolean | true/false   | false   |
-| show-header          | 是否显示表头                            | boolean | true/false   | true   |
-| row-class-name          | 行的 className 的回调方法,也可以使用字符串为所有行设置一个固定的 className。   | function({ row, rowIndex }) / string | -   | -   |
-| row-style          | 行的 style 的回调方法,也可以使用一个固定的 Object 为所有行设置一样的 Style。   | function({ row, rowIndex }) / object | -   | -   |
-| header-row-class-name          | 表头的class,传字符串   | string | -   | -   |
-| header-row-style          | 表头的style,传object   | object | -   | -   |
-| empty-text          | 空数据时显示的文本内容, 也可以通过 #empty 设置   | string | -   | 暂无数据   |
-| show-footer          | 是否显示表尾合计项                            | boolean | true/false   | false   |
-| footer-text          | 显示摘要行第一列的文本                            | string | -   | 合计   |
-| footer-method          | 自定义的合计计算方法                        | function({ columns, data }) | -   | -   |
-| index-show          | 是否显示序号                            | boolean | true/false   | false   |
-| index-method          | 序号的回调方法                            | function(index) |-   | -   |
-| index-width          | 序号列的宽度                           | string |-   | 60px  |
-| min-item-width          | 每列的最小宽度                           | string |-   | 80px  |
-
-**basic-table columns[]**
-
-| key             | 说明                                 | 
-|-----------------|------------------------------------|
-| fieldName             | 对应的value字段                                 | 
-| fieldDesc             | 对应的label字段(表头显示的label)                                 | 
-| fieldType             | 默认为空,若设置为slot,即自定义列 | 
-| width             | 默认自适应 | 
-| fixed             | 固定列,可选值left/right | 
-
-
-**basic-table 事件**
-
-| 事件名             | 说明                                 |  回调参数  |
-|-----------------|------------------------------------|--------|-----|------|
-| header-click             | 当某一列的表头被点击时会触发该事件                                 |  -  |
-| row-click             | 当某一行被点击时会触发该事件                                 |  scope, index  |
-| cell-click             | 当某一单元格被点击时会触发该事件                                 |  scope,column, index  |
-
-**插槽**
-| 插槽名              | 说明                                 | 
-|-----------------|------------------------------------     |
-| item | 某列数据item,需设置fieldType为slot                                      | 
-| empty          | 列表为空时的内容                              | 
-
-
-# 使用示例
-
-
-```
-index.vue
-
-<template>
-   <basic-table :columns="columns" :data="tableData">
-      <template #item="{column,scope,index}">
-	     <view v-if="column.fieldName==='name'">
-		    {{scope.name}}
-		 </view>
-		 <view v-else-if="column.fieldName==='age'">
-		 	{{scope.age}}
-		 </view>
-	  </template>
-   </basic-table>
-</template>
-
-<script>
-import BasicTable from '@/pages/components/basic-table/basic-table.vue';
-export default {
-	components: { BasicTable },
-	data() {
-		return {
-			tableData: [{ name: '张三', age: 18 }, { name: '李四', age: 22 }],
-			columns: [
-				{
-					fieldName: 'name',
-					fieldDesc: '姓名',
-					fieldType:'slot'
-				},
-				{
-					fieldName: 'age',
-					fieldDesc: '年龄',
-					fieldType:'slot'
-				}
-			]
-		};
-	},
-};
-</script>
-
-<style lang="scss"></style>
-
-```
-
-## 打赏
-
-如果你觉得本插件,解决了你的问题,可以请作者喝杯咖啡
-
-<div>
-<img src="https://i.328888.xyz/2023/02/28/zV27Q.jpeg" alt="alipay" width="250"><img src="https://i.328888.xyz/2023/02/28/zVw2H.jpeg" alt="wechat" width="250">
-</div>
+ 
 
 

+ 74 - 125
circlePages/addShare.vue

@@ -7,25 +7,24 @@
 			</view>
 			<view slot="default" style="display: flex;">
 				<view style="flex:1;margin-left:25px">
-					<text>发布供应</text>
+					<text :style="{fontSize:(wxFontSize)+'px'}">发布供应</text>
 				</view>
 				<view>
-					<button plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)">暂存</button>
-					<!-- <text style="margin-right: 4px;padding: 6px 15px;background-color:#00000026;border-radius: 30px;color: #3D7EFF;" @click="saveForm(1)">暂存</text> -->
+					<button plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
 				</view>
 			</view>
 		</tn-nav-bar>
 
 		<view class="tn-safe-area-inset-bottom" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 
-			<tn-steps style="pointer-events:none;" :list="selectValue=='个人'?stepList:stepList2" :current="stepIndex" mode="dotIcon"></tn-steps>
+			<tn-steps style="pointer-events:none;" :list="selectValue=='个人'?stepList:stepList2" :current="stepIndex" mode="dotIcon" :fontSize="(wxFontSize-3)+'px'"></tn-steps>
 			<view v-if="stepIndex==1">
 
 				<view style="padding: 16px">
-					<view style="line-height: 30px;">
+					<view style="line-height: 30px;" :style="{fontSize:(wxFontSize-1)+'px'}">
 						发布主体:
 						<uni-data-checkbox :multiple="false" v-model="selectValue" selectedColor="#01BEFF"
-							:localdata="[{text: '个人',value: '个人'},{text: '公司',value: '公司'}]" />
+							:localdata="[{text: '个人',value: '个人'},{text: '公司',value: '公司'}]" :fontSize="(wxFontSize-3)+'px'"/>
 					</view>
 					<!-- <uni-data-select v-model="selectValue" :localdata="selectList" @change="changeSelect"
 						:clear="false"></uni-data-select> -->
@@ -34,74 +33,52 @@
 				<view v-if="selectValue=='个人'" style="padding: 16px">
 					<uni-forms :modelValue="formData" label-width="0">
 
-						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>用户昵称:</text>
+						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">用户昵称:</text>
 						 
 						<uni-forms-item label="用户昵称" name="realName" label-width="0">
-							<uni-easyinput type="text" disabled v-model="formInfo.contactNickName" placeholder="请输入您的昵称" />
+							<uni-easyinput type="text" disabled :inputSize="wxFontSize-3" :placeholder-style="styleString" v-model="formInfo.contactNickName" placeholder="请输入您的昵称" />
 						</uni-forms-item>
-						<text style="line-height: 30px;vertical-align: middle;">真实姓名:</text>
+						<text style="line-height: 30px;vertical-align: middle;" :style="{fontSize:(wxFontSize-3)+'px'}">真实姓名:</text>
 						<uni-forms-item label="真实姓名" name="contactMethod">
-							<uni-easyinput type="text" disabled="" v-model="formInfo.userRealName" placeholder="请输入真实姓名" />
+							<uni-easyinput type="text" disabled="true" :inputSize="wxFontSize-3" :placeholder-style="styleString" v-model="formInfo.userRealName" placeholder="请输入真实姓名" />
 						</uni-forms-item>
-						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>联系方式:</text>
+						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">联系方式:</text>
 						<uni-forms-item label="联系方式" name="phone">
-							<uni-easyinput type="text" disabled v-model="formInfo.contactMethod" placeholder="请输入联系手机/微信/邮箱" />
+							<uni-easyinput type="text" disabled :inputSize="wxFontSize-3" :placeholder-style="styleString" v-model="formInfo.contactMethod" placeholder="请输入联系手机/微信/邮箱" />
 						</uni-forms-item>
 
 					</uni-forms>
-					<text style="font-size: 13px;color:#999;">如要更改个人信息,请在我的=><text>个人信息</text>页面更改</text>
+					<text style="font-size: 13px;color:#999;" :style="{fontSize:(wxFontSize-4)+'px'}">如要更改个人信息,请在我的=><text>个人信息</text>页面更改</text>
 				</view>
 
 				<view v-if="selectValue=='公司'" style="padding: 16px">
 					<uni-forms :modelValue="formData" label-width="0">
 						<view style="margin-bottom:16px">
-							<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>公司名称:</text>
+							<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">公司名称:</text>
 							<w-select style="width: 100%;" v-model='searchValue' :list='items' valueName='name'
-								keyName="regNumber" @change='selectChange' :filterable="true">
+								keyName="regNumber" @change='selectChange' :filterable="true" :fontSize="(wxFontSize-3)+'px'">
 							</w-select>
 						</view>
 						<!-- <uni-forms-item label="公司名称" name="name">
 					<uni-easyinput type="text" v-model="userInfo.company" placeholder="请输入所在公司名称" />
 				</uni-forms-item> -->
-						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>您的职称:</text>
+						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">您的职称:</text>
 						<uni-forms-item label="" name="realName" label-width="0">
-							<uni-easyinput type="text" :clearable="false" v-model="formInfo.jobTitle" placeholder="请输入您的职称" />
+							<uni-easyinput type="text" :clearable="false" :inputSize="wxFontSize-3" :placeholder-style="styleString" v-model="formInfo.jobTitle" placeholder="请输入您的职称" />
 						</uni-forms-item>
-						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>联系人姓名:</text>
+						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">联系人姓名:</text>
 						<uni-forms-item label="联系人姓名" name="contactMethod">
-							<uni-easyinput type="text" :clearable="false" v-model="formInfo.contactPerson" placeholder="请输入联系人姓名" />
+							<uni-easyinput type="text" :clearable="false" :inputSize="wxFontSize-3" :placeholder-style="styleString" v-model="formInfo.contactPerson" placeholder="请输入联系人姓名" />
 						</uni-forms-item>
-						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>联系方式:</text>
+						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">联系方式:</text>
 						<uni-forms-item label="联系方式" name="phone">
-							<uni-easyinput type="text" :clearable="false" v-model="formInfo.contactMethod" placeholder="请输入联系手机/微信/邮箱" />
+							<uni-easyinput type="text" :clearable="false" :inputSize="wxFontSize-3" :placeholder-style="styleString" v-model="formInfo.contactMethod" placeholder="请输入联系手机/微信/邮箱" />
 						</uni-forms-item>
 
-						<uni-forms-item label="11" required>
-							<uni-data-checkbox v-model="formInfo.agree"
-								localdata="[{text: '同意平台核查所填信息的真实性',value: '是'}]" />
-						</uni-forms-item>
+						 
 					</uni-forms>
 				</view>
 
-
-
-
-
-				<!-- <view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top-xl tn-margin">
-        <view class="tn-flex justify-content-item">
-          <view class="tn-bg-black tn-color-white tn-text-center" style="border-radius: 100rpx;margin-right: 8rpx;width: 45rpx;height: 45rpx;line-height: 45rpx;">
-            <text class="tn-icon-tag" style="font-size: 30rpx;"></text>
-          </view>
-          <view class="tn-text-lg tn-padding-right-xs tn-text-bold">话题标签</view>
-        </view>
-        <view class="justify-content-item tn-text-df tn-color-grey">
-          <text class="tn-padding-xs">选择</text>
-          <text class="tn-icon-right"></text>
-        </view>
-      </view> -->
-
-				
-
 				<!-- 悬浮按钮-->
 				<view class="tn-flex tn-footerfixed">
 					<!-- <view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
@@ -113,7 +90,7 @@
 					</view> -->
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
 						<button type="default" plain="true" style="border-radius: 24px;"
-							@click="nextStep()">
+							@click="nextStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
 							 下一步 
 						</button>
 					</view>
@@ -123,27 +100,27 @@
 
 				<view style="padding: 16px;padding-bottom: 0;" v-if="(selectValue=='公司'&&stepIndex==2)||(selectValue=='个人'&&stepIndex==2)">
 					
-					<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>发布种类:</text>
+					<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">发布种类:</text>
 					<uni-data-select v-model="selectValue2" :localdata="selectList2" @change="changeSelect2"
-						:clear="false"></uni-data-select>
+						:clear="false" :fontSize="(wxFontSize-3)+'px'"></uni-data-select>
 				</view>
 
 				<view v-if="selectValue2=='产品'" >
 					<view style="padding: 16px" v-if="(selectValue=='公司'&&stepIndex==2)||(selectValue=='个人'&&stepIndex==2)">
-						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>产品种类:</text>
+						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">产品种类:</text>
 						<uni-data-select v-model="selectValue4" :localdata="selectList4" @change="changeSelect4"
-							placeholder="产品种类" :clear="false" style="margin-bottom:16px"></uni-data-select>
+							placeholder="产品种类" :clear="false" style="margin-bottom:16px" :fontSize="(wxFontSize-3)+'px'"></uni-data-select>
 						
 						
 						<view style="margin-top: 16px;">
-						   <text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>产品品牌:</text>
-						   <uni-easyinput type="text" :clearable="false" required v-model="brand" placeholder="请输入产品品牌" />
+						   <text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">产品品牌:</text>
+						   <uni-easyinput type="text" :clearable="false" :inputSize="wxFontSize-3" :placeholder-style="styleString" required v-model="brand" placeholder="请输入产品品牌" />
 						</view>
 						<view style="margin-top: 16px;margin-bottom: 20px;">
-							<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text>发布的产品是否属于医疗器械?
+							<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">发布的产品是否属于医疗器械?</text>
 							<uni-data-checkbox :multiple="false" v-model="isMedical" selectedColor="#01BEFF"
-								:localdata="[{text: '是',value: '1'},{text: '否',value: '0'}]" />
-							<text v-if="isMedical==1" style="font-size: 13px;color:#999;">如若产品是医疗器械,请在上传附件步骤上传产品注册证,企业经营许可证等相关信息。</text>
+								:localdata="[{text: '是',value: '1'},{text: '否',value: '0'}]" :fontSize="(wxFontSize-3)+'px'"/>
+							<text v-if="isMedical==1" style="font-size: 13px;color:#999;" :style="{fontSize:(wxFontSize-5)+'px'}">如若产品是医疗器械,请在上传附件步骤上传产品注册证,企业经营许可证等相关信息。</text>
 						</view>
 
 						<view v-for="item,itemIndex in extList">
@@ -153,11 +130,11 @@
 												<uni-list>
 													<uni-list-item style="align-items: center;">
 															<template v-slot:header>
-																 产品信息{{itemIndex+1}}
+																 <text :style="{fontSize:(wxFontSize-4)+'px'}">产品信息{{itemIndex+1}}</text>
 															</template>
 															<template v-slot:footer>
-																<button type="default" style="color:#1d60b1;border-color:#1d60b1;" plain="true" size="mini" v-if="(extList.length>1&&extList.length<6&&itemIndex==extList.length-1)||extList.length==1" @click="newItem">+新增产品</button>
-																<button type="warn" plain="true" size="mini" v-if="extList.length>1&&itemIndex!==extList.length-1" @click="delItem(itemIndex)">-删除产品</button>
+																<button type="default" style="color:#1d60b1;border-color:#1d60b1;" :style="{fontSize:(wxFontSize-5)+'px'}" plain="true" size="mini" v-if="(extList.length>1&&extList.length<6&&itemIndex==extList.length-1)||extList.length==1" @click="newItem">+新增产品</button>
+																<button type="warn" plain="true" size="mini" :style="{fontSize:(wxFontSize-5)+'px'}" v-if="extList.length>1&&itemIndex!==extList.length-1" @click="delItem(itemIndex)">-删除产品</button>
 																<!-- <tn-button fontColor="tn-color-white" shape="round" backgroundColor="#3668FC" v-if="extList.length==1" @click="newItem">+新增产品</tn-button>
 																 <tn-button fontColor="tn-color-white" shape="round" backgroundColor="#3668FC" v-if="extList.length>1&&extList.length<6&&itemIndex==extList.length-1" @click="newItem">+新增产品</tn-button>
 																 <tn-button fontColor="tn-color-white" shape="round" backgroundColor="#FF000C" v-if="extList.length>1&&itemIndex!==extList.length-1" @click="delItem(itemIndex)">-删除产品</tn-button> -->
@@ -169,54 +146,29 @@
 										<uni-forms :modelValue="formData" label-width="0">
 											 
 											<uni-forms-item label="" name="prodName" label-width="0">
-												<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>产品名称:</text>
-												<uni-easyinput maxlength="50" type="text" :clearable="false" v-model="item.prodName"
+												<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-4)+'px'}">*</text><text  :style="{fontSize:(wxFontSize-4)+'px'}">产品名称:</text>
+												<uni-easyinput maxlength="50" type="text" :inputSize="wxFontSize-4" :placeholder-style="styleString"  :clearable="false" v-model="item.prodName"
 													placeholder="请输入产品名称" />
 											</uni-forms-item>
 											<uni-forms-item label="" name="prodSpec" label-width="0">
-												<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>产品型号:</text>
-												<uni-easyinput maxlength="100" type="text" :clearable="false" v-model="item.prodSpec"
+												<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-4)+'px'}">*</text><text :style="{fontSize:(wxFontSize-4)+'px'}">产品型号:</text>
+												<uni-easyinput maxlength="100" type="text" :inputSize="wxFontSize-4" :placeholder-style="styleString" :clearable="false" v-model="item.prodSpec"
 													placeholder="请输入产品型号" />
 											</uni-forms-item>
 											<uni-forms-item label="" name="prodDesc">
-												<text style="line-height: 30px;vertical-align: middle;">产品介绍:</text>
-												<uni-easyinput maxlength="500" type="textarea" v-model="item.prodDesc" placeholder="请输入产品介绍" />
+												<text style="line-height: 30px;vertical-align: middle;" :style="{fontSize:(wxFontSize-4)+'px'}">产品介绍:</text>
+												<uni-easyinput maxlength="500" :inputSize="wxFontSize-4" :placeholder-style="styleString" type="textarea" v-model="item.prodDesc" placeholder="请输入产品介绍" />
 											</uni-forms-item>
 
 										</uni-forms>
 										<template v-slot:actions v-if="itemIndex==extList.length-1" >
-											<view style="margin: 12px;margin-top: -12px;">
+											<view style="margin: 12px;margin-top: -12px;" :style="{fontSize:(wxFontSize-5)+'px'}">
 												<text style="color:#999">为保证排版整洁,最多一次上传六个产品哦</text>
 											</view>
 										</template>
 							</uni-card>
 							</view>
-							<!-- <view>
-								
-								<uni-forms :modelValue="formData" label-width="0">
-									<view style="display: flex;justify-content: space-between;">
-										<view><text class="tn-icon-p" style="font-size: 30rpx;"></text>产品{{itemIndex+1}}</view>
-										  
-										<view><tn-button v-if="extList.length==1" @click="newItem">+新增产品</tn-button>
-										<tn-button v-if="extList.length>1&&extList.length<6&&itemIndex==extList.length-1" @click="newItem">+新增产品</tn-button>
-										<tn-button v-if="extList.length>1&&itemIndex!==extList.length-1" @click="delItem(itemIndex)">-删除产品</tn-button></view>
-										
-									</view>
-									<uni-forms-item label="" name="prodName" label-width="0">
-										<uni-easyinput type="text" required v-model="item.prodName"
-											placeholder="*请输入产品名称" />
-									</uni-forms-item>
-									<uni-forms-item label="" name="contactMethod">
-										<uni-easyinput type="text" required v-model="item.prodSpec"
-											placeholder="*请输入产品型号" />
-									</uni-forms-item>
-									<uni-forms-item label="" name="phone">
-										<uni-easyinput type="text" v-model="item.prodDesc" placeholder="请输入产品介绍" />
-									</uni-forms-item>
-
-
-								</uni-forms>
-							</view> -->
+							 
 
 						</view>
 
@@ -226,25 +178,21 @@
 				</view>
 				<view v-if="selectValue2=='服务'&&stepIndex==2">
 					<view style="padding: 16px">
-						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>服务类型:</text>
+						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;"  :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">服务类型:</text>
 						<uni-data-select v-model="selectValue3" :localdata="selectList3" @change="changeSelect3"
-							:clear="false"></uni-data-select>
+							:clear="false" :fontSize="(wxFontSize-3)+'px'"></uni-data-select>
 					</view>
 				</view>
 				
 				<view v-if="selectValue2=='服务'&&stepIndex==2">
 					<view style="padding: 16px">
-					   <text style="line-height: 30px;vertical-align: middle;">服务品牌:</text>
-					   <uni-easyinput type="text" :clearable="false" v-model="brand" placeholder="请输入服务品牌" />
+					   <text style="line-height: 30px;vertical-align: middle;" :style="{fontSize:(wxFontSize-3)+'px'}">服务品牌:</text>
+					   <uni-easyinput type="text" :clearable="false" :inputSize="wxFontSize-3" :placeholder-style="styleString" v-model="brand" placeholder="请输入服务品牌" />
 					</view>
 				</view>
 					
 				<view>
-
-
-					<!-- <view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
-					 	<input placeholder="写下一句简短的标题" name="input" placeholder-style="color:#AAAAAA" ></input>
-					 </view> -->
+ 
 					 <view v-if="selectValue2=='服务'&&stepIndex==2" style="padding: 16px;padding-bottom: 0;margin-bottom: -30rpx;">
 					    <text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>服务介绍:</text>
 					 </view>
@@ -252,16 +200,16 @@
 						style="border-radius: 10rpx;">
 						
 						<textarea maxlength="500" v-model="content" placeholder="请输入服务介绍"
-							placeholder-style="color:#AAAAAA"></textarea>
+							placeholder-style="color:#AAAAAA" :style="{fontSize:(wxFontSize-3)+'px'}" :placeholder-style="styleString"></textarea>
 					</view>
 
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center  tn-margin" style="margin-bottom: 0;" v-if="stepIndex==3">
 						<view class="tn-flex justify-content-item">
 							<view class="tn-text-center"
 								style="border-radius: 100rpx;margin-right: 8rpx;width: 45rpx;height: 45rpx;line-height: 45rpx;">
-								<text class="tn-icon-image" style="font-size: 20px;"></text>
+								<text class="tn-icon-image" style="font-size: 20px;" :style="{fontSize:(wxFontSize+3)+'px'}"></text>
 							</view>
-							<view class="tn-padding-right-xs tn-text-bold" style="font-size: 16px;">上传图片(选填)</view>
+							<view class="tn-padding-right-xs tn-text-bold" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">上传图片(选填)</view>
 						</view>
 						<!-- <view class="justify-content-item tn-text-df tn-color-grey" @tap="clear">
 					 					<text class="tn-padding-xs">清空上传</text>
@@ -281,13 +229,9 @@
 
 						</uni-file-picker>
 						<view style="margin-top: 8px;">
-							<text style="color: #999;font-size: 12px;">一次只能上传六张图片</text>
+							<text style="color: #999;font-size: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">一次只能上传六张图片</text>
 						</view>
-						
-						<!-- <tn-image-upload-drag ref="imageUpload" :action="action" :width="236" :height="236" :formData="formData"
-					 					:fileList="fileList" :disabled="disabled" :autoUpload="autoUpload" :maxCount="maxCount"
-					 					:showUploadList="showUploadList" :showProgress="showProgress" :deleteable="deleteable"
-					 					:customBtn="customBtn" @sort-list="onSortList" /> -->
+						 
 
 					</view>
 
@@ -295,9 +239,9 @@
 						<view class="tn-flex justify-content-item">
 							<view class="tn-text-center"
 								style="border-radius: 100rpx;margin-right: 8rpx;width: 45rpx;height: 45rpx;line-height: 45rpx;">
-								<text class="tn-icon-link" style="font-size: 20px;"></text>
+								<text class="tn-icon-link" style="font-size: 20px;" :style="{fontSize:(wxFontSize+3)+'px'}"></text>
 							</view>
-							<view class="tn-padding-right-xs tn-text-bold"  style="font-size: 16px;">上传相关文件(选填)</view>
+							<view class="tn-padding-right-xs tn-text-bold"  style="font-size: 16px;"  :style="{fontSize:(wxFontSize-1)+'px'}">上传相关文件(选填)</view>
 						</view>
 						<!-- <view class="justify-content-item tn-text-df tn-color-grey" @tap="clear">
 					 					<text class="tn-padding-xs">清空上传</text>
@@ -309,43 +253,43 @@
 						<uni-file-picker v-model="fileList" :limit="3" mode="grid" file-mediatype="all"
 							file-extname="pdf,docx,doc,xls,xlsx" :auto-upload="false" @select="select" @success="success" @delete="deleteFile">
 							<view style="text-align: left;">
-								<button size="mini" style="color:#1d60b1;border-color:#1d60b1;display: inline-block;" plain="true">上传文件</button>
+								<button size="mini" style="color:#1d60b1;border-color:#1d60b1;display: inline-block;" plain="true"  :style="{fontSize:(wxFontSize-5)+'px'}">上传文件</button>
 							</view>
 							
 						
 						</uni-file-picker>
 						<view style="margin-top: 4px;">
-							<text style="color: #999;font-size: 12px;">一次只能上传三个文件,支持格式 pdf .doc .xls,不超过5MB。</text>
+							<text style="color: #999;font-size: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">一次只能上传三个文件,支持格式 pdf .doc .xls,不超过5MB。</text>
 						</view>
 						 
 						 
 						<view style="margin-top:6px" v-if="selectValue2=='产品'">
-							<text style="color: #999;font-size: 12px;">如若产品属于医疗器械,请上传相关资质证明。</text>
+							<text style="color: #999;font-size: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">如若产品属于医疗器械,请上传相关资质证明。</text>
 						</view>
-						<!-- <tn-image-upload-drag ref="imageUpload" :action="action" :width="236" :height="236" :formData="formData"
-					 					:fileList="fileList2" :disabled="disabled" :autoUpload="autoUpload" :maxCount="maxCount"
-					 					:showUploadList="showUploadList" :showProgress="showProgress" :deleteable="deleteable"
-					 					:customBtn="customBtn" @sort-list="onSortList" /> -->
+						 
 
 					</view>
 				</view>
 
 				<view label="11" name="check" style="padding:16px;margin-top:20px" v-if="stepIndex==3">
-					<uni-data-checkbox :multiple="true" v-model="formInfo.agree" selectedColor="#45c05d" 
-						:localdata="[{text: '同意平台核查所填信息的真实性',value: '是'}]" />
+					<tn-checkbox v-model="formInfo.agree" activeColor="#45c05d" :size="wxFontSize+17" name="选项1"  >
+						<text :style="{fontSize:(wxFontSize-4)+'px',color:formInfo.agree?'#45c05d':'#666666'}">同意平台核查所填信息的真实性</text>
+					</tn-checkbox>
+					<!-- <uni-data-checkbox :multiple="true" v-model="formInfo.agree" selectedColor="#45c05d" 
+						:localdata="[{text: '同意平台核查所填信息的真实性',value: '是'}]" /> -->
 				</view>
 				
 				<!-- 悬浮按钮-->
 				<view class="tn-flex tn-footerfixed" >
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
 						<button type="default" plain="true" style="border-radius: 24px;"
-							@click="preStep()">
+							@click="preStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
 							 上一步 
 						</button>
 					</view>
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
 						<button type="default" plain="true" style="border-radius: 24px;"
-							@click="nextStep()">
+							@click="nextStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
 							 下一步 
 						</button>
 						<!-- <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold
@@ -358,13 +302,13 @@
 				<view class="tn-flex tn-footerfixed"  v-if="(stepIndex==3)">
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
 						<button type="default" plain="true" style="border-radius: 24px;"
-							@click="preStep()">
+							@click="preStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
 							 上一步 
 						</button>
 						 
 					</view>
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-						<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="saveForm()">提交审核</button>
+						<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
 						<!-- <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold
 							@click="saveForm()">
 							<text class="tn-color-white">提交审核</text>
@@ -389,6 +333,8 @@
 		mixins: [template_page_mixin],
 		data() {
 			return {
+				wxFontSize: 17,
+				styleString:'font-size:'+14+'px',
 				showTips:false,
 				canSave:true,
 				isMedical: '1',
@@ -465,7 +411,7 @@
 					jobTitle: '',
 					userRealName:JSON.parse(uni.getStorageSync('userInfo')).userRealName,
 					// contactPerson:JSON.parse(uni.getStorageSync('userInfo')).contactNickName?JSON.parse(uni.getStorageSync('userInfo')).contactNickName:'用户'+JSON.parse(uni.getStorageInfoSync('userInfo')).userName.splice(-4),
-					agree: [],
+					agree: false,
 					contactNickName: JSON.parse(uni.getStorageSync('userInfo')).contactNickName||'用户'+JSON.parse(uni.getStorageSync('userInfo')).userName.slice(-4),
 					contactMethod: JSON.parse(uni.getStorageSync('userInfo')).contactMethod || JSON.parse(uni
 						.getStorageSync('userInfo')).userName
@@ -541,6 +487,9 @@
 			}
 		},
 		onLoad(props) {
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			this.styleString='font-size:'+(this.wxFontSize-3)+'px';
 			//从暂存里面编辑
 			if(props.sid){
 				this.isEdit = true;
@@ -782,7 +731,7 @@
 					}
 				}
 				
-				if(status!=1&&this.formInfo.agree.length<1){
+				if(status!=1&&!this.formInfo.agree){
 					uni.showToast({
 						title: '请勾选同意平台核查所填信息的真实性',
 						duration: 2000,

+ 37 - 62
circlePages/circle.vue

@@ -4,54 +4,40 @@
 		<tn-nav-bar fixed customBack>
 			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack">
 				<text class='icon tn-icon-left'></text>
-				<!-- <text class='icon tn-icon-home-capsule-fill'></text> -->
 			</view>
 			
 			<view slot="default"  style="display: flex;">
 				<view style="flex:1;margin-left:25px">
-					<text>发布需求</text>
+					<text :style="{fontSize:(wxFontSize)+'px'}">发布需求</text>
 				</view>
 				<view>
-					<button plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)">暂存</button>
-<!-- 					<text style="margin-right: 4px;padding: 6px 15px;background-color:#00000026;border-radius: 30px;color: #3D7EFF;" @click="saveForm(1)">暂存</text> -->
+					<button plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)" :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
 				</view>
 			</view>
 		</tn-nav-bar>
 
 		<view class="tn-safe-area-inset-bottom" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 
-			<tn-steps style="pointer-events:none;" :list="stepList" :current="stepIndex" mode="dotIcon"></tn-steps>
-			<!-- <uni-steps :options="stepList" :active="stepIndex" /> -->
+			<tn-steps style="pointer-events:none;" :list="stepList" :current="stepIndex" mode="dotIcon" :fontSize="(wxFontSize-3)+'px'"></tn-steps>
 			
 			<view v-if="stepIndex==1">
 			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
 				<view class="tn-flex justify-content-item">
-					<!-- <view class="tn-bg-black tn-color-white tn-text-center"
-						style="border-radius: 100rpx;margin-right: 8rpx;width: 45rpx;height: 45rpx;line-height: 45rpx;">
-						<text class="tn-icon-topics" style="font-size: 30rpx;"></text>
-					</view> -->
-					<view class="tn-text-lg tn-padding-right-xs tn-text-bold" style="font-size: 16px;">以下三种方式可任选其一,若有可都输入</view>
+					<view class="tn-text-lg tn-padding-right-xs tn-text-bold" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">以下三种方式可任选其一,若有可都输入</view>
 				</view>
-				<!-- <view class="justify-content-item tn-text-df tn-color-grey">
-					<text class="tn-padding-xs">500字内</text>
-					<text class="tn-icon-keyboard-circle"></text>
-				</view> -->
 			</view>
 
-			<!-- <view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
-      	<input placeholder="写下一句简短的标题" name="input" placeholder-style="color:#AAAAAA" ></input>
-      </view> -->
 			<view class="tn-margin tn-bg-gray--light tn-padding" style="border-radius: 10rpx;">
-				<textarea maxlength="500" v-model="content" placeholder="请描述您的需求..." placeholder-style="color:#AAAAAA"></textarea>
+				<textarea maxlength="500" v-model="content" placeholder="请描述您的需求..." :style="{fontSize:(wxFontSize-3)+'px'}"  :placeholder-style="styleString"></textarea>
 			</view>
 
 			<view class="tn-flex tn-flex-row-between tn-flex-col-center  tn-margin" style="margin-top:40px;margin-bottom: 0;">
 				<view class="tn-flex justify-content-item">
 					<view class=" tn-text-center"
 						style="border-radius: 100rpx;margin-right: 8rpx;width: 45rpx;height: 45rpx;line-height: 45rpx;">
-						<text class="tn-icon-image" style="font-size: 20px;"></text>
+						<text class="tn-icon-image" style="font-size: 20px;" :style="{fontSize:(wxFontSize+3)+'px'}"></text>
 					</view>
-					<view class="tn-padding-right-xs tn-text-bold"  style="font-size: 16px;">上传图片</view>
+					<view class="tn-padding-right-xs tn-text-bold"  style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">上传图片</view>
 				</view>
 				<!-- <view class="justify-content-item tn-text-df tn-color-grey" @tap="clear">
 					<text class="tn-padding-xs">清空上传</text>
@@ -69,7 +55,7 @@
 					v-model="imgList" :limit="6" @delete="deleteFile"  :auto-upload="false" @select="select" @success="success">
 				</uni-file-picker>
 				<view style="margin-top: 8px;">
-					<text style="color: #999;font-size: 12px;">一次只能上传六张图片</text>
+					<text style="color: #999;font-size: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">一次只能上传六张图片</text>
 				</view>
 				
 
@@ -79,9 +65,9 @@
 				<view class="tn-flex justify-content-item">
 					<view class=" tn-text-center"
 						style="border-radius: 100rpx;margin-right: 8rpx;width: 45rpx;height: 45rpx;line-height: 45rpx;">
-						<text class="tn-icon-link" style="font-size: 20px;"></text>
+						<text class="tn-icon-link" style="font-size: 20px;" :style="{fontSize:(wxFontSize+3)+'px'}"></text>
 					</view>
-					<view class="tn-padding-right-xs tn-text-bold" style="font-size: 16px;">上传文件</view>
+					<view class="tn-padding-right-xs tn-text-bold" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">上传文件</view>
 				</view>
 				<!-- <view class="justify-content-item tn-text-df tn-color-grey" @tap="clear">
 					<text class="tn-padding-xs">清空上传</text>
@@ -94,49 +80,36 @@
 					v-model="fileList" :limit="3" mode="grid" @delete="deleteFile"  file-mediatype="all" file-extname="pdf,docx,doc,xls,xlsx" :auto-upload="false" @select="select" @success="success">
 				<!-- <button size="default">上传文件</button> -->
 				<view style="text-align: left;">
-					<button size="mini" style="color:#1d60b1;border-color:#1d60b1;" plain="true">上传文件</button>
+					<button size="mini" style="color:#1d60b1;border-color:#1d60b1;" plain="true" :style="{fontSize:(wxFontSize-5)+'px'}">上传文件</button>
 				</view>
 				<!-- <tn-button shadow shape="round" fontColor="tn-color-white" size="lg" backgroundColor="tn-bg-blue" :fontSize="24" height="auto" padding="20rpx 36rpx">上传文件</tn-button>
 				 -->
 				</uni-file-picker>
 				<view style="margin-top: 4px;">
-					<text style="color: #999;font-size: 12px;">一次只能上传三个文件,支持格式 pdf .doc .xls,不超过5MB。</text>
+					<text style="color: #999;font-size: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">一次只能上传三个文件,支持格式 pdf .doc .xls,不超过5MB。</text>
 				</view>
 				
 			
 			</view>
 			
 			<view style="margin-top:20px;padding: 16px">
-				<text style="font-size: 16px;line-height: 30px;">需求有效期:</text>
+				<text style="font-size: 16px;line-height: 30px;" :style="{fontSize:(wxFontSize-1)+'px'}">需求有效期:</text>
 				<uni-data-select
 				    v-model="selectValue"
 				    :localdata="selectList"
 				    @change="changeSelect"
 					placement="top"
 					placeholder="请选择"
+					:fontSize="(wxFontSize-3)+'px'"
 				  ></uni-data-select>
 			</view>
-
-			<!-- <view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top-xl tn-margin">
-        <view class="tn-flex justify-content-item">
-          <view class="tn-bg-black tn-color-white tn-text-center" style="border-radius: 100rpx;margin-right: 8rpx;width: 45rpx;height: 45rpx;line-height: 45rpx;">
-            <text class="tn-icon-tag" style="font-size: 30rpx;"></text>
-          </view>
-          <view class="tn-text-lg tn-padding-right-xs tn-text-bold">话题标签</view>
-        </view>
-        <view class="justify-content-item tn-text-df tn-color-grey">
-          <text class="tn-padding-xs">选择</text>
-          <text class="tn-icon-right"></text>
-        </view>
-      </view> -->
-
 			
 
 			<!-- 悬浮按钮-->
 			<view class="tn-flex tn-footerfixed">
 				<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
 					<button type="default" plain="true" style="border-radius: 24px;"
-						@click="nextStep()">
+						@click="nextStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
 						 下一步 
 					</button>
 				</view>
@@ -146,8 +119,8 @@
 	
 	<view style="padding:16px">
 		<uni-forms :modelValue="formData" label-width="0">
-			<view style="margin:16px 0">
-				<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>公司名称:</text>
+			<view style="margin:16px 0" :style="{fontSize:(wxFontSize-3)+'px'}">
+				<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" >*</text><text>公司名称:</text>
 			<w-select
 			     style="width: 100%;" 
 			     v-model='searchValue' 
@@ -156,27 +129,30 @@
 			     keyName="regNumber"
 			     @change='selectChange'
 				 :filterable="true"
+				 :fontSize="(wxFontSize-3)+'px'"
 			   >
 			   </w-select>
 			</view>
 			<!-- <uni-forms-item label="公司名称" name="name">
 				<uni-easyinput type="text" v-model="userInfo.company" placeholder="请输入所在公司名称" />
 			</uni-forms-item> -->
-			<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>您的职称:</text>
+			<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">您的职称:</text>
 			<uni-forms-item label="" name="realName" label-width="0">
-				 <uni-easyinput type="text" v-model="formInfo.jobTitle" :clearable="false" placeholder="请输入您的职称" />
+				 <uni-easyinput type="text" v-model="formInfo.jobTitle" :inputSize="wxFontSize-3" :placeholder-style="styleString" :clearable="false" placeholder="请输入您的职称" />
 			</uni-forms-item>
-			<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>联系人姓名:</text>
+			<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">联系人姓名:</text>
 			<uni-forms-item label="联系人姓名" name="contactMethod">
-				 <uni-easyinput type="text" v-model="formInfo.contactPerson" :clearable="false" placeholder="请输入联系人姓名" />
+				 <uni-easyinput type="text" v-model="formInfo.contactPerson" :inputSize="wxFontSize-3" :placeholder-style="styleString" :clearable="false" placeholder="请输入联系人姓名" />
 			</uni-forms-item>
-			<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>联系方式:</text>
+			<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;" :style="{fontSize:(wxFontSize-3)+'px'}">*</text><text :style="{fontSize:(wxFontSize-3)+'px'}">联系方式:</text>
 			<uni-forms-item label="联系方式" name="phone">
-				 <uni-easyinput type="text"  v-model="formInfo.contactMethod" :clearable="false" placeholder="请输入联系手机/微信/邮箱" />
+				 <uni-easyinput type="text"  v-model="formInfo.contactMethod" :inputSize="wxFontSize-3" :placeholder-style="styleString" :clearable="false" placeholder="请输入联系手机/微信/邮箱" />
 			</uni-forms-item>
 			 
 			<uni-forms-item label="11" name="check">
-				<uni-data-checkbox :multiple="true" selectedColor="#45c05d" v-model="formInfo.agree" :localdata="[{text: '同意平台核查所填信息的真实性',value: '是'}]" />
+				<tn-checkbox v-model="formInfo.agree" activeColor="#45c05d" :size="wxFontSize+17" name="选项1"  >
+					<text :style="{fontSize:(wxFontSize-4)+'px',color:formInfo.agree?'#45c05d':'#666666'}">同意平台核查所填信息的真实性</text>
+				</tn-checkbox>
 			</uni-forms-item>
 		</uni-forms>
 	</view>
@@ -184,12 +160,12 @@
 	<view class="tn-flex tn-footerfixed">
 		<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
 			<button type="default" plain="true" style="border-radius: 24px;"
-				@click="preStep()">
+				@click="preStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
 				 上一步 
 			</button>
 		</view>
 		<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-			<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="saveForm()">提交审核</button>
+			<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
 		</view>
 	</view>
 </view>
@@ -210,6 +186,7 @@
 		mixins: [template_page_mixin],
 		data() {
 			return {
+				wxFontSize:17,
 				canSave: true,
 				selectValue: '',
 				//非常紧急/两周/一月/长期
@@ -229,15 +206,13 @@
 				content:'',
 				formInfo:{
 					jobTitle:'',
-					// contactPerson:JSON.parse(uni.getStorageSync('userInfo')).contactNickName?JSON.parse(uni.getStorageSync('userInfo')).contactNickName:'用户'+JSON.parse(uni.getStorageInfoSync('userInfo')).userName.splice(-4),
-					agree:[],
+					agree:false,
 					contactPerson:JSON.parse(uni.getStorageSync('userInfo')).contactNickName,
 					contactMethod:JSON.parse(uni.getStorageSync('userInfo')).contactMethod||JSON.parse(uni.getStorageSync('userInfo')).userName
 				},
 				imgList:[],
 				fileDetailList:[],
 				stepIndex:1,
-				// stepList:[{title:'填写需求'},{title: '填写联系方式'}],
 				stepList: [{
 						name: '填写需求',
 						icon: 'circle',
@@ -269,7 +244,8 @@
 					name:'',
 					regNumber:''
 				},
-				editItem:{}
+				editItem:{},
+				styleString:'font-size:'+14+'px'
 			}
 		},
 		watch: {
@@ -281,14 +257,13 @@
 				if(this.stepIndex==2){
 					this.search(val)
 				}
-				// if(this.org.name!=this.org.regNumber){
-					
-				// }
 				
 			}
 		},
 		onLoad(props) {
-			console.error(props.sid);
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			this.styleString='font-size:'+(this.wxFontSize-3)+'px';
 			if(props.sid){
 				this.isEdit = true;
 				this.editItem = JSON.parse(uni.getStorageSync(props.sid)||'{}');
@@ -434,7 +409,7 @@
 					return false;
 				}
 				
-				if(status!=1&&this.formInfo.agree.length<1){
+				if(status!=1&&!this.formInfo.agree){
 					uni.showToast({
 						title: '请勾选同意平台核查所填信息的真实性',
 						duration: 2000,

+ 7 - 3
components/basic-table/basic-table.vue

@@ -7,7 +7,7 @@
 						<view class="b-tr" :class="getHeaderClass" :style="getHeaderStyle" @click="handleHeaderClick">
 							<view class="b-th" v-if="indexShow" :style="[getIndexColStyle]"><view class="b-cell">序号</view></view>
 							<view class="b-th" v-for="item in columns" :key="item.fieldName" :class="[getCellProps(item).class]" :style="[getCellProps(item).style]">
-								<view class="b-cell">{{ item.fieldDesc }}</view>
+								<view class="b-cell" :style="{fontSize:fontSize+'px'}">{{ item.fieldDesc }}</view>
 							</view>
 						</view>
 					</view>
@@ -25,12 +25,12 @@
 							@click="handleRowClick(scope, index)"
 						>
 							<view class="b-td" v-if="indexShow" :style="[getIndexColStyle]">
-								<view class="b-cell">{{ getIndexMethod(index) }}</view>
+								<view class="b-cell" :style="{fontSize:fontSize+'px'}">{{ getIndexMethod(index) }}</view>
 							</view>
 							<view class="b-td" v-for="column in columns" :key="column.fieldName" :class="[getCellProps(column).class]" :style="[getCellProps(column).style]">
 								<view class="b-cell" @click.stop="handleCellClick(scope, column, index)">
 									<slot name="item" :scope="scope" :column="column" v-if="column.fieldType === 'slot'"></slot>
-									<view v-else>{{ scope[column.fieldName] }}</view>
+									<view v-else :style="{fontSize:fontSize+'px'}">{{ scope[column.fieldName] }}</view>
 								</view>
 							</view>
 						</view>
@@ -140,6 +140,10 @@ export default {
 		headerRowStyle: {
 			type: Object
 		},
+		fontSize:{
+			type: Number,
+			default: 15
+		},
 		indexWidth: {
 			type: String,
 			default: '60px'

+ 7 - 2
components/w-select/w-select.vue

@@ -27,7 +27,7 @@
 		  @blur="blurChange"
 		  :placeholder="multiple ? multiSelectList.length === 0 ? defaultValue : '' : defaultValue"
 		  :disabled="!filterable"
-		  :style="!filterable ? 'pointer-events: none' : ''"
+		  :style="!filterable ? 'pointer-events: none' : 'font-size:'+fontSize"
 		  :value="inputData"
 		  style="font-size: 14px;font-weight: bold;"
 		>
@@ -113,12 +113,13 @@
 			v-for="item in filterList"
 			:key="item[keyName]"
 			class="select-option-item"
+			:style="{fontSize:fontSize}"
 		  >
 			{{ item[valueName] }}
 		  </view>
 		  <!-- #endif -->
   
-		  <view class="options-no-data" v-if="filterList.length < 1">
+		  <view class="options-no-data" v-if="filterList.length < 1" :style="{fontSize:fontSize}">
 			无匹配数据~
 		  </view>
 		</scroll-view>
@@ -190,6 +191,10 @@
 	  keyName: {
 		type: String,
 		default: 'value'
+	  },
+	  fontSize:{
+		  type: String,
+		  default:'14px'
 	  }
 	},
 	// #ifdef VUE3

+ 21 - 137
minePages/set.vue

@@ -6,6 +6,12 @@
         @click="goBack">
         <text class='icon tn-icon-left'></text>
       </view>
+	  <view slot="default">
+			<view>
+				<text :style="{fontSize:(wxFontSize)+'px'}">个人信息</text>
+			</view>
+			 
+		  </view>
     </tn-nav-bar>
 
     <view class="tn-margin-top" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
@@ -15,159 +21,32 @@
 		  	v-model="value" mode="list" :auto-upload="false" @select="select" @success="success">
 		  	<image v-if="!userInfo.profilePhotoUrl" src="../static/me2.png" style="width: 100px;height: 100px;"></image>
 		  	<image v-if="userInfo.profilePhotoUrl" :src="userInfo.profilePhotoUrl" style="width: 100px;height: 100px;border-radius: 50%;"></image>
-			<view><text class="tn-color-grey">点击修改</text></view>
+			<view><text class="tn-color-grey" :style="{fontSize:(wxFontSize-4)+'px'}">点击修改</text></view>
 		  </uni-file-picker>
 		 
 	  </view>
-      <!-- <view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding" @click="tn('/minePages/avatar')">
-        <view class="justify-content-item">
-          <view class="tn-text-bold tn-text-lg">
-            用户头像
-          </view>
-          <view class="tn-color-gray tn-padding-top-xs">
-            有趣的头像,百里挑一
-          </view>
-        </view>
-        <view class="justify-content-item tn-text-lg tn-color-grey">
-          <view class="logo-pic tn-shadow">
-            <view class="logo-image">
-              <view class="tn-shadow-blur" style="background-image:url('https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg');width: 80rpx;height: 80rpx;background-size: cover;">
-              </view>
-            </view>
-          </view>
-        </view>
-      </view> -->
+      
 	  
 	  <view class="" style="padding: 16px;
     margin-top: 16px;">
 	  		<uni-forms :modelValue="formData" label-width="100px">
-	  			<uni-forms-item label="用户昵称" name="name">
-	  				<uni-easyinput type="text" :clearable="false" v-model="userInfo.contactNickName" placeholder="请输入昵称" />
+	  			<uni-forms-item label="用户昵称" name="name" :labelFontSize="wxFontSize-2">
+	  				<uni-easyinput type="text" :clearable="false" v-model="userInfo.contactNickName" :inputSize="wxFontSize-3" :placeholder-style="styleString" placeholder="请输入昵称" />
 	  			</uni-forms-item>
-	  			<uni-forms-item label="真实姓名" name="realName">
-	  				 <uni-easyinput type="text" :clearable="false" v-model="userInfo.userRealName" placeholder="请输入姓名" />
+	  			<uni-forms-item label="真实姓名" name="realName" :labelFontSize="wxFontSize-2">
+	  				 <uni-easyinput type="text" :clearable="false" v-model="userInfo.userRealName" :inputSize="wxFontSize-3" :placeholder-style="styleString" placeholder="请输入姓名" />
 	  			</uni-forms-item>
-				<uni-forms-item label="联系方式" name="contactMethod">
-					 <uni-easyinput type="text" v-model="userInfo.contactMethod" :clearable="false" placeholder="请输入手机号码/邮箱/微信" />
+				<uni-forms-item label="联系方式" name="contactMethod" :labelFontSize="wxFontSize-2">
+					 <uni-easyinput type="text" v-model="userInfo.contactMethod" :clearable="false" :inputSize="wxFontSize-3" :placeholder-style="styleString" placeholder="请输入手机号码/邮箱/微信" />
 				</uni-forms-item>
-				<uni-forms-item label="手机号" name="phone">
-					 <uni-easyinput type="text" disabled  v-model="userInfo.userName" placeholder=" " />
+				<uni-forms-item label="手机号" name="phone" :labelFontSize="wxFontSize-2">
+					 <uni-easyinput type="text" disabled  v-model="userInfo.userName" :inputSize="wxFontSize-3" :placeholder-style="styleString" placeholder=" " />
 				</uni-forms-item>
 	  			 
 	  		</uni-forms>
 	  		<button shape="round" style="background-color: #1d60b1;border-radius: 30px;" type="primary" @click="saveForm">保存修改</button>
 	  	</view>
-      
-      <!-- <view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding" @click="showModal1">
-        <view class="justify-content-item">
-          <view class="tn-text-bold tn-text-lg">
-            用户名
-          </view>
-          <view class="tn-color-gray tn-padding-top-xs">
-            --
-          </view>
-        </view>
-        <view class="justify-content-item tn-text-lg tn-color-grey">
-          
-		  <view class="tn-icon-right tn-padding-top"></view>
-        </view>
-      </view>
-      
-      <view class="tn-flex tn-flex-row-between tn-strip-bottom tn-padding" @click="showModal2">
-        <view class="justify-content-item">
-          <view class="tn-text-bold tn-text-lg">
-            手机号
-          </view>
-          <view class="tn-color-gray tn-padding-top-xs">
-            13911111193
-          </view>
-        </view>
-        <view class="justify-content-item tn-text-lg tn-color-grey">
-          <view class="tn-icon-right tn-padding-top"></view>
-        </view>
-      </view>
-      
-      <view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding" @click="showModal3">
-        <view class="justify-content-item">
-          <view class="tn-text-bold tn-text-lg">
-            联系方式
-          </view>
-          <view class="tn-color-gray tn-padding-top-xs">
-            未填写
-          </view>
-        </view>
-        <view class="justify-content-item tn-text-lg tn-color-grey">
-          <view class="tn-icon-right tn-padding-top"></view>
-        </view>
-      </view>
-       
        
-      <picker @change="bindPickerChange1" :value="index1" :range="array1">
-        <view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding">
-          <view class="justify-content-item">
-            <view class="tn-text-bold tn-text-lg">
-              所属公司
-            </view>
-            <view class="tn-color-gray tn-padding-top-xs">
-              {{array1[index1]}}
-            </view>
-          </view>
-          <view class="justify-content-item tn-text-lg tn-color-grey">
-            <view class="tn-icon-right tn-padding-top"></view>
-          </view>
-        </view>
-      </picker> -->
-      <tn-modal v-model="show1" :custom="true" :showCloseBtn="true">
-        <view class="custom-modal-content">
-          <view class="">
-            <view class="tn-text-lg tn-text-bold tn-color-purplered tn-text-center tn-padding">修改昵称</view>
-            <view class="tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;margin: 50rpx 0 60rpx 0;">
-            	<input placeholder="==" name="input" placeholder-style="color:#AAAAAA" maxlength="20"></input>
-            </view>
-          </view>
-          <view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-            <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold>
-              <text class="tn-color-white">保 存</text>
-            </tn-button>
-          </view>
-        </view>
-      </tn-modal>
-      
-      <tn-modal v-model="show2" :custom="true" :showCloseBtn="true">
-        <view class="custom-modal-content">
-          <view class="">
-            <view class="tn-text-lg tn-text-bold tn-color-purplered tn-text-center tn-padding">变更手机号码</view>
-            <view class="tn-bg-gray--light tn-color-gray" style="border-radius: 10rpx;padding: 20rpx 30rpx;margin: 50rpx 0 60rpx 0;">
-              13911111193
-            </view>
-          </view>
-          <view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-            <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold>
-              <text class="tn-color-white">获取手机号</text>
-            </tn-button>
-            <!-- <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold open-type="getPhoneNumber">
-              <text class="tn-color-white">获取手机号</text>
-            </tn-button> -->
-            <view class="tn-padding-top-sm">因为获取手机号api收费了,所以这里注释掉,需要的自行展示出来即可</view>
-          </view>
-        </view>
-      </tn-modal>
-      
-      <tn-modal v-model="show3" :custom="true" :showCloseBtn="true">
-        <view class="custom-modal-content">
-          <view class="">
-            <view class="tn-text-lg tn-text-bold tn-color-purplered tn-text-center tn-padding">请输入真实姓名</view>
-            <view class="tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;margin: 50rpx 0 60rpx 0;">
-              <input placeholder="请填写姓名" name="input" placeholder-style="color:#AAAAAA" maxlength="20"></input>
-            </view>
-          </view>
-          <view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-            <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold @click="saveForm()">
-              <text class="tn-color-white">保 存</text>
-            </tn-button>
-          </view>
-        </view>
-      </tn-modal>
       
       
       
@@ -186,6 +65,7 @@
     mixins: [template_page_mixin],
     data(){
       return {
+		wxFontSize: 17,
         show1: false,
         show2: false,
         show3: false,
@@ -200,6 +80,7 @@
 			contactMethod:uni.getStorageSync('userInfo')?JSON.parse(uni.getStorageSync('userInfo')).contactMethod:'',
 			userName:uni.getStorageSync('userInfo')?JSON.parse(uni.getStorageSync('userInfo')).userName:''
 		},
+		styleString:'font-size:'+14+'px'
       }
     },
     computed: {
@@ -211,6 +92,9 @@
         }
     },
 	onLoad(){
+		const appBaseInfo = wx.getAppBaseInfo();
+		this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+		this.styleString='font-size:'+(this.wxFontSize-3)+'px';
 		this.getInfo();
 	},
     methods: {

+ 28 - 94
pages/comm/comm.vue

@@ -11,12 +11,12 @@
 							style="flex:1;background-color: #f8f8f8;border-radius: 18px;color: #bbb;line-height: 35px;"
 							@click="showSearch">
 							<view>
-								<uni-icons type="search" color="#bbbbbb" size="18" style="margin: 8px;"></uni-icons>
-								<text v-if="!searchProdValue">产品名称/品牌/产品型号</text>
-								<text v-if="searchProdValue">{{searchProdValue}}</text>
+								<uni-icons type="search" color="#bbbbbb" :size="wxFontSize+1" style="margin: 8px;"></uni-icons>
+								<text :style="{fontSize:(wxFontSize-2)+'px'}" v-if="!searchProdValue">产品名称/品牌/产品型号</text>
+								<text :style="{fontSize:(wxFontSize-2)+'px'}" v-if="searchProdValue">{{searchProdValue}}</text>
 							</view>
 						</view>
-						<view v-if="searchProdValue" @click="clearProd" style="line-height: 36px;margin-left: 10px;">取消
+						<view v-if="searchProdValue" @click="clearProd" style="line-height: 36px;margin-left: 10px;" :style="{fontSize:(wxFontSize-2)+'px'}">取消
 						</view>
 					</view>
 				</view>
@@ -26,12 +26,12 @@
 							style="flex:1;background-color: #f8f8f8;border-radius: 18px;color: #bbb;line-height: 35px;"
 							@click="showSearch2">
 							<view>
-								<uni-icons type="search" color="#bbbbbb" size="18" style="margin: 8px;"></uni-icons>
-								<text v-if="!searchProdValue2">品牌/服务内容</text>
-								<text v-if="searchProdValue2">{{searchProdValue2}}</text>
+								<uni-icons type="search" color="#bbbbbb" :size="wxFontSize+1" style="margin: 8px;"></uni-icons>
+								<text v-if="!searchProdValue2" :style="{fontSize:(wxFontSize-2)+'px'}">品牌/服务内容</text>
+								<text v-if="searchProdValue2" :style="{fontSize:(wxFontSize-2)+'px'}">{{searchProdValue2}}</text>
 							</view>
 						</view>
-						<view v-if="searchProdValue2" @click="clearProd2" style="line-height: 36px;margin-left: 10px;">取消
+						<view v-if="searchProdValue2" @click="clearProd2" style="line-height: 36px;margin-left: 10px;"  :style="{fontSize:(wxFontSize-2)+'px'}">取消
 						</view>
 					</view>
 				</view>
@@ -41,7 +41,7 @@
 					clearButton="auto">
 				</uni-search-bar> -->
 
-				<tn-tabs-swiper :list="tabList" :isScroll="false" :current="currentTab" name="tab-name"
+				<tn-tabs-swiper :list="tabList" :isScroll="false" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50" :current="currentTab" name="tab-name"
 					@change="changeTab" style="border-bottom: 1rpx solid #f1f1f1cc;">
 				</tn-tabs-swiper>
 			</uv-sticky>
@@ -64,24 +64,14 @@
 										  </tn-avatar>
 										</view> -->
 										<view class="tn-padding-right tn-text-ellipsis">
-											<view class="tn-padding-right tn-color-grey tn-text-lg">
+											<view class="tn-padding-right tn-color-grey tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
 												{{ item.company||(item.contactNickName||item.contactPerson) }}
 											</view>
 											<!-- <view class="tn-padding-right tn-padding-left-sm tn-padding-top-xs tn-color-gray">{{ item.date }}</view> -->
 										</view>
 									</view>
 								</view>
-							</view>
-							<view v-if="1==0"
-								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-								<text class="" style="background: #3F51B542;font-size: 12px;
-								  padding: 8px;
-								  color: #0000FF;
-								  border-radius: 24px;
-								  border-top-right-radius: 0;">{{item.validDate}}</text>
-							</view>
-
-						 
+							</view>			 
 						</view>
 
 						<view
@@ -90,12 +80,12 @@
 						 
 							<!-- 不用限制长度了,因为发布的时候限制长度了-->
 							<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="item.brand"
-								fontColor="#3a96d7" shape="circle">{{ item.brand }}</tn-tag>
+								fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11">{{ item.brand }}</tn-tag>
 							<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="!item.company"
-								fontColor="#3a96d7" shape="circle">个人</tn-tag>
+								fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11">个人</tn-tag>
 
 							<text v-if="item.content"
-								class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df">{{ item.content }}</text>
+								class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
 
 						</view>
 
@@ -103,16 +93,12 @@
 						<view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
 							:id="`blogger__content--${index}`">
 
-							<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true"
+							<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true" :fontSize="(wxFontSize-3)"
 								:stripe="true" :data="item.shareExt">
 								<template #item="{column,scope,index}">
-								 
-								 
 									 <view v-if="column.fieldName==='prodDesc'">
-										 
 										<tn-read-more openText="查看全部" :closeBtn="true" closeText="收起" :showHeight="125">
-											<text>{{scope.prodDesc||''}}</text>
-										  
+											<text :style="{fontSize:(scope.fontSize-3)+'px'}">{{scope.prodDesc||''}}</text>
 										</tn-read-more>
 									 </view>
 							    </template>
@@ -151,11 +137,8 @@
 						
 						<view v-for="file in item.fileDetailList" :key="file.id" v-if="!isImage(file.fileName)">
 							<view style="margin-top:10px">
-								<text class="tn-icon-link"></text>
-								<view style="display: inline-block;margin-left:8px;    white-space: nowrap;
-     
-    text-overflow: ellipsis;
-    width: 80%;" @click="clickLink(file.ftpUrl,file.fileName)">
+								<text class="tn-icon-link" :style="{fontSize:(wxFontSize-4)+'px'}"></text>
+								<view style="display: inline;margin-left:8px;" @click="clickLink(file.ftpUrl,file.fileName)" :style="{fontSize:(wxFontSize-3)+'px'}">
 									{{file.fileName}}</view>
 
 							</view>
@@ -163,7 +146,7 @@
 
 						<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
 							<view class="justify-content-item tn-color-gray tn-text-center">
-								<view class="tn-padding-right   tn-padding-top-xs tn-color-gray">
+								<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" :style="{fontSize:(wxFontSize-3)+'px'}">
 									{{ item.createTime|formatDate }}
 								</view>
 
@@ -226,10 +209,10 @@
 				<!-- 广告 -->
 				<!-- 结尾 -->
 				<view v-if="content.length==totalSize&&totalSize!=0&&currentTab==0" style="background-color: #f1f1f1cc;padding: 16px 0;"  :style="{paddingTop:showSheet?'216px':'16px'}">
-					<tn-load-more status="nomore" :loadText="loadText"></tn-load-more>
+					<tn-load-more status="nomore" :loadText="loadText" :fontSize="(wxFontSize+11)"></tn-load-more>
 				</view>
 				<view v-if="content.length==totalSize&&totalSize!=0&&currentTab==1" style="background-color: #f1f1f1cc;padding: 16px 0;"  :style="{paddingTop:showSheet?'216px':'16px'}">
-					<tn-load-more status="nomore" :loadText="loadText2"></tn-load-more>
+					<tn-load-more status="nomore" :loadText="loadText2" :fontSize="(wxFontSize+11)"></tn-load-more>
 				</view>
 				 
 
@@ -322,20 +305,16 @@
 				current: 0,
 				collStatus: '',
 				searchValue: '',
-				 
-				// 内容默认隐藏显示的高度
-				contentHideShowHeight: 0,
 				content: [],
 				totalSize: 0,
 				curIndex: 1,
+				wxFontSize:17
 			}
 		},
-
-		onLoad() {
-			this.initContentData()
-			this.contentHideShowHeight = uni.upx2px(56) * 3
-		},
 		onReady() {
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			
 			this.$nextTick(() => {
 				this.fetchData()
 			})
@@ -491,21 +470,6 @@
 					url: '/circlePages/build'
 				})
 			},
-			// 处理内容,给内容添加对应的标识信息
-			initContentData() {
-
-				this.content.forEach((item, index) => {
-					// 是否需要隐藏内容
-					item.hideContent = false
-					// 显示所有内容
-					item.showAllContent = false
-					// 内容容器的实际高度
-					item.contentContainerHeight = 0
-					// 内容容器是否初始化完成
-					item.contentContainerInit = false
-					this.$set(this.content, index, item)
-				})
-			},
 			reFetchData() {
 				this.loading = true;
 				uni.showToast({
@@ -563,6 +527,9 @@
 									newList[i].imgList.push(newList[i].fileDetailList[j]);
 								}
 							}
+							for(let k = 0;newList[i].shareExt&&k<newList[i].shareExt.length;k++){
+								newList[i].shareExt[k].fontSize= this.wxFontSize;
+							}
 						}
 						if (curIndex == 1) {
 							that.content = newList || [];
@@ -575,39 +542,6 @@
 
 					console.warn(res);
 				})
-				// let contentRect = {}
-				// const query = uni.createSelectorQuery().in(this)
-				// // 筛选出存在内容的数据
-				// this.content.forEach((item, index) => {
-				//   if (item?.content) {
-				//     query.select(`#blogger__content--${index}`).boundingClientRect()
-				//     contentRect[index] = item
-				//   }
-				// })
-				// // 获取所有内容的宽高信息
-				// query.exec(res => {
-				//   if (!res) {
-				//     setTimeout(() => {
-				//       this.fetchData()
-				//     }, 10)
-				//     return
-				//   }
-				//   // console.log(res);
-				//   res.map((item) => {
-				//     // console.log(item.height, this.contentHideShowHeight);
-				//     // 获取对应的标号
-				//     const id = item.id
-				//     const idIndex = /blogger__content--(\d)/.exec(id)[1]
-				//     let contentItem = this.content[idIndex]
-				//     contentItem.hideContent = item.height > this.contentHideShowHeight
-				//     contentItem.showAllContent = false
-				//     contentItem.contentContainerHeight = item.height
-				//     contentItem.contentContainerInit = true
-				//     this.$set(this.content, idIndex, contentItem)
-
-				//     // console.log(/blogger__content--(\d)/.exec(id)[1]);
-				//   })
-				// })
 			},
 
 			showActionSheet(item) {

+ 11 - 6
pages/comm/search.vue

@@ -7,29 +7,29 @@
 		  </view>
 		  <view slot="default">
 		  	<view>
-		  		<text>搜索</text>
+		  		<text :style="{fontSize:(wxFontSize)+'px'}">搜索</text>
 		  	</view>
 		  	 
 		  </view>
 		</tn-nav-bar>
 		
 		<view style="width: 100%;padding:16px"  :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-			<uni-search-bar radius="30" :focus="true" v-model="prodName"  placeholder="请输入您感兴趣的产品名称(选填)" cancelButton="none">
+			<uni-search-bar radius="30" :focus="true" :fontSize="(wxFontSize-2)" v-model="prodName"  placeholder="请输入您感兴趣的产品名称(选填)" cancelButton="none">
 				<template v-slot:searchIcon>
 						 
 					</template>
 			</uni-search-bar>
-			<uni-search-bar radius="30"  v-model="brand"  placeholder="请输入您感兴趣的产品品牌(选填)" cancelButton="none">
+			<uni-search-bar radius="30"  v-model="brand"  :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的产品品牌(选填)" cancelButton="none">
 				<template v-slot:searchIcon>
 						 
 					</template>
 			</uni-search-bar>
-			<uni-search-bar radius="30" v-model="prodSpec" placeholder="请输入您感兴趣的产品型号(选填)" cancelButton="none">
+			<uni-search-bar radius="30" v-model="prodSpec" :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的产品型号(选填)" cancelButton="none">
 				<template v-slot:searchIcon>
 						 
 					</template>
 			</uni-search-bar>
-			<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="searchProd">搜索</button>
+			<button type="primary" style="background-color:#1d60b1;border-radius: 23px" :style="{fontSize:(wxFontSize-2)+'px'}" @click="searchProd">搜索</button>
 			<!-- <button type="primary" style="border-radius:30px;background-color: #3a96d7;" radius @click="searchProd">搜索</button> -->
 		</view>
 	</view>
@@ -41,9 +41,14 @@
 			return {
 				brand: '',
 				prodName:'',
-				prodSpec: '',	
+				prodSpec: '',
+				wxFontSize: 17
 			}
 		},
+		onLoad(){
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+		},
 		methods: {
 			goBack(){
 				uni.navigateBack();

+ 9 - 4
pages/comm/search2.vue

@@ -7,7 +7,7 @@
 		  </view>
 		  <view slot="default">
 		  	<view>
-		  		<text>搜索</text>
+		  		<text :style="{fontSize:(wxFontSize)+'px'}">搜索</text>
 		  	</view>
 		  	 
 		  </view>
@@ -15,17 +15,17 @@
 		
 		<view style="width: 100%;padding:16px"  :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 			 
-			<uni-search-bar radius="30"  v-model="brand"  placeholder="请输入您感兴趣的产品品牌(选填)" cancelButton="none">
+			<uni-search-bar radius="30" :focus="true" v-model="brand" :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的产品品牌(选填)" cancelButton="none">
 				<template v-slot:searchIcon>
 						 
 					</template>
 			</uni-search-bar>
-			<uni-search-bar radius="30" v-model="content" placeholder="请输入您感兴趣的服务内容(选填)" cancelButton="none">
+			<uni-search-bar radius="30" v-model="content" :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的服务内容(选填)" cancelButton="none">
 				<template v-slot:searchIcon>
 						 
 					</template>
 			</uni-search-bar>
-			<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="searchProd">搜索</button>
+			<button type="primary" style="background-color:#1d60b1;border-radius: 23px" :style="{fontSize:(wxFontSize-2)+'px'}" @click="searchProd">搜索</button>
 			<!-- <button type="primary" style="border-radius:30px;background-color: #3a96d7;" radius @click="searchProd">搜索</button> -->
 		</view>
 	</view>
@@ -37,8 +37,13 @@
 			return {
 				brand: '',
 				content:'',
+				wxFontSize: 17
 			}
 		},
+		onLoad(){
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+		},
 		methods: {
 			goBack(){
 				uni.navigateBack();

+ 11 - 11
pages/discovery/discovery.vue

@@ -10,15 +10,15 @@
 						src="../../static/logo.png"></image>
 				</view>
 				<view style="margin:16px 0;margin-left: -8px;">
-					<view style="font-weight: bold;font-size: 22px;">速立保</view>
-					<text style="margin-top:12px;color:#888;font-size:15px">生物制药产业一站式产品资源供需平台</text>
+					<view style="font-weight: bold;font-size: 22px;" :style="{fontSize:(fontSize+4)+'px'}">速立保</view>
+					<text style="margin-top:12px;color:#888;font-size:15px" :style="{fontSize:(fontSize-3)+'px'}">生物制药产业一站式产品资源供需平台</text>
 				</view>
 			</view>
 			
 			
 		</view>
 		
-		<view style="padding: 0px 0 4px 16px;font-weight: bold;">
+		<view style="padding: 0px 0 4px 16px;font-weight: bold;" :style="{fontSize:(fontSize-1)+'px'}">
 			 优质入驻企业 ▼ 
 		</view>
 		
@@ -33,7 +33,7 @@
 		<view v-if="hideComps" style="height: 200px;display: flex;align-items: center;justify-content: center;color: #2196f36e;">
 			<text @click="showComps()">〈恢复展示〉</text>
 		</view>
-		<view style="padding: 16px 0 4px 16px;font-weight: bold;">
+		<view style="padding: 16px 0 4px 16px;font-weight: bold;"  :style="{fontSize:(fontSize-1)+'px'}">
 			 优质供应 ▼ 
 		</view>
 		<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"  v-if="!hideProds">
@@ -55,14 +55,14 @@
 		<view style="margin-top:24px"><text style="font-size:20px;">生物制药产业一站式产品资源供需平台</text></view> -->
 		 
 		<view style="display: flex;margin-top:32px;margin: 24px;">
-			<view style="flex: 1;padding: 0 16px;" class="bg01" @click="showAdd">
+			<view style="flex: 1;padding: 0 0 0 16px;" class="bg01" @click="showAdd">
 				<text style="font-size: 32px;margin-right: 10px;vertical-align: sub;" class="tn-icon-email-fill" ></text>
-				<text style="line-height: 72px;font-size: 18px;">我要什么</text>
+				<text style="line-height: 72px;font-size: 18px;" :style="{fontSize:(fontSize+1)+'px'}">我要什么</text>
 				
 			</view>
-			<view style="flex: 1;padding: 0 16px;" class="bg02" @click="showAdd2">
+			<view style="flex: 1;padding: 0 0 0 16px;" class="bg02" @click="showAdd2">
 				<text style="font-size: 32px;margin-right: 10px;vertical-align: sub;" class="tn-icon-paperbag-fill" ></text>
-				<text style="line-height: 72px;font-size: 18px;">我有什么</text>
+				<text style="line-height: 72px;font-size: 18px;" :style="{fontSize:(fontSize+1)+'px'}">我有什么</text>
 			</view>
 		</view>
 		
@@ -83,12 +83,12 @@
 				  prodList:[],
 				  hideComps: false,
 				  hideProds: false,
+				  fontSize:17
 			}
 		},
-		onLoad(){
-			this.loadData();
-		},
 		onReady() {
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.fontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
 			this.$nextTick(() => {
 				this.loadData()
 				this.loadData2()

+ 13 - 24
pages/home/home.vue

@@ -6,7 +6,7 @@
 		<view class="">
 			<uv-sticky bgColor="#ffffff">
 				<uni-search-bar radius="15" placeholder="搜索" @confirm="search" v-model="searchValue" @blur="search"
-					@cancel="cancel" @clear="clear" cancelButton="auto" clearButton="auto"
+					@cancel="cancel" @clear="clear" cancelButton="auto" clearButton="auto" :fontSize="(wxFontSize-2)"
 					style="border-bottom: 1rpx solid #f1f1f1cc;">
 				</uni-search-bar></uv-sticky>
 
@@ -23,7 +23,7 @@
 										</tn-avatar>
 									</view> -->
 									<view class="tn-padding-right tn-text-ellipsis">
-										<view class="tn-padding-right  tn-color-grey tn-text-lg">
+										<view class="tn-padding-right  tn-color-grey tn-text-lg" :style="{fontSize:(wxFontSize)+'px'}">
 											{{ item.company }}
 										</view>
 
@@ -37,13 +37,13 @@
     padding: 8px;
     color: #0000FF;
     border-radius: 24px;
-    border-top-right-radius: 0;" @click="showValid(item.validDate)">{{item.validDate}}</text>
+    border-top-right-radius: 0;" :style="{fontSize:(wxFontSize-6)+'px'}" @click="showValid(item.validDate)">{{item.validDate}}</text>
 						</view>
 					</view>
 
 					<view
 						class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
-						@click="tn('')">
+						>
 						<!-- <view v-for="(label_item,label_index) in item.label" :key="label_index"
 							class="blogger__desc__label tn-float-left tn-margin-right">
 							<text class="blogger__desc__label--prefix tn-icon-topics-fill"></text>
@@ -51,7 +51,7 @@
 						</view> -->
 						<!-- 不用限制长度了,因为发布的时候限制长度了-->
 						<text
-							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df">{{ item.content }}</text>
+							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
 					</view>
 
 
@@ -88,8 +88,8 @@
 					</block>
 					<view v-for="file in item.fileDetailList" style="margin-bottom: 4px;" :key="file.id" v-if="!isImage(file.fileName)">
 						<view>
-							<text class="tn-icon-link"></text>
-							<view style="display: inline-block;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)">
+							<text class="tn-icon-link" :style="{fontSize:(wxFontSize-4)+'px'}"></text>
+							<view style="display: inline;margin-left:8px" :style="{fontSize:(wxFontSize-3)+'px'}" @click="clickLink(file.ftpUrl,file.fileName)">
 								{{file.fileName}}</view>
 
 						</view>
@@ -98,7 +98,7 @@
 
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
 						<view class="justify-content-item tn-color-gray tn-text-center">
-							<view class="tn-padding-right   tn-padding-top-xs tn-color-gray">
+							<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" :style="{fontSize:(wxFontSize-3)+'px'}">
 								{{ item.createTime|formatDate }}
 							</view>
 
@@ -154,7 +154,7 @@
 			</view>
 			<!-- 结尾 -->
 			<view v-if="content.length==totalSize&&totalSize!=0" style="background-color: #f1f1f1cc;padding: 16px 0;" :style="{paddingTop:showSheet?'216px':'16px'}">
-				<tn-load-more status="nomore" :loadText="loadText"></tn-load-more>
+				<tn-load-more status="nomore" :loadText="loadText" :fontSize="(wxFontSize+11)"></tn-load-more>
 			</view>
 
 
@@ -223,7 +223,7 @@
 				isAndroid: true,
 				content: [],
 				showEmpty:false,
-
+				wxFontSize:17,
 			}
 		},
 		filters: {
@@ -251,12 +251,9 @@
 
 		},
 		created() {
-			const systemInfo = uni.getSystemInfoSync()
-			if (systemInfo.system.toLocaleLowerCase().includes('ios')) {
-				this.isAndroid = false
-			} else {
-				this.isAndroid = true
-			}
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			
 			// const accountInfo = uni.getAccountInfoSync();
 			// if(accountInfo&&accountInfo.miniProgram.envVersion&&accountInfo.miniProgram.version){
 				//正式上线版本
@@ -264,15 +261,7 @@
 			// }
 			
 		},
-		onReachBottom() {
-			console.warn(12345);
-		},
-		 
 		methods: {
-			// cardSwiper
-			cardSwiper(e) {
-				this.cardCur = e.detail.current
-			},
 			clickLink(url,fileName) {
 				// uni.navigateTo({
 				// 	url:'/pages/webview/web-view?url='+encodeURIComponent('https://slb-m.lx-device.com/webview?title='+fileName+'&url='+ url),

+ 13 - 12
pages/index/detail/detail.vue

@@ -8,7 +8,7 @@
 
 			<view slot="default" style="display: flex;">
 				<view style="flex:1;">
-					<text>速立保</text>
+					<text :style="{fontSize:(wxFontSize)+'px'}">速立保</text>
 				</view>
 
 			</view>
@@ -34,7 +34,7 @@
 													  </tn-avatar>
 													</view> -->
 													<view class="tn-padding-right tn-text-ellipsis">
-														<view class="tn-padding-right tn-color-grey tn-text-lg">
+														<view class="tn-padding-right tn-color-grey tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
 															{{ item.company||(item.contactNickName||item.contactPerson) }}
 														</view>
 														<!-- <view class="tn-padding-right tn-padding-left-sm tn-padding-top-xs tn-color-gray">{{ item.date }}</view> -->
@@ -48,7 +48,7 @@
 											  padding: 8px;
 											  color: #0000FF;
 											  border-radius: 24px;
-											  border-top-right-radius: 0;">{{item.validDate}}</text>
+											  border-top-right-radius: 0;" :style="{fontSize:(wxFontSize-6)+'px'}">{{item.validDate}}</text>
 										</view>
 				
 									 
@@ -60,12 +60,12 @@
 									 
 										<!-- 不用限制长度了,因为发布的时候限制长度了-->
 										<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="item.brand"
-											fontColor="#3a96d7" shape="circle">{{ item.brand }}</tn-tag>
+											fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11">{{ item.brand }}</tn-tag>
 										<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="!item.company"
-											fontColor="#3a96d7" shape="circle">个人</tn-tag>
+											fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11">个人</tn-tag>
 				
 										<text v-if="item.content"
-											class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df">{{ item.content }}</text>
+											class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
 				
 									</view>
 				
@@ -73,7 +73,7 @@
 									<view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
 										:id="`blogger__content--${index}`">
 				
-										<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true"
+										<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true"  :fontSize="(wxFontSize-3)"
 											:stripe="true" :data="item.shareExt">
 				
 										</basic-table>
@@ -112,10 +112,7 @@
 									<view v-for="file in item.fileDetailList" :key="file.id" v-if="!isImage(file.fileName)">
 										<view style="margin-top:10px">
 											<text class="tn-icon-link"></text>
-											<view style="display: inline-block;margin-left:8px;    white-space: nowrap;
-				 
-				text-overflow: ellipsis;
-				width: 80%;" @click="clickLink(file.ftpUrl,file.fileName)">
+											<view style="display: inline;margin-left:8px;" @click="clickLink(file.ftpUrl,file.fileName)" :style="{fontSize:(wxFontSize-3)+'px'}">
 												{{file.fileName}}</view>
 				
 										</view>
@@ -123,7 +120,7 @@
 				
 									<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
 										<view class="justify-content-item tn-color-gray tn-text-center">
-											<view class="tn-padding-right   tn-padding-top-xs tn-color-gray">
+											<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" :style="{fontSize:(wxFontSize-3)+'px'}">
 												{{ item.createTime|formatDate }}
 											</view>
 				
@@ -224,6 +221,7 @@
 				}],
 				curContact:{},
 				showContact: false,
+				wxFontSize:17
 			}
 		},
 		filters: {
@@ -504,6 +502,9 @@
 			},
 		},
 		onLoad(props) {
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			
 			 this.bisNo = props.id;
 			 this.isNeed = props.isNeed;
 			 this.loadData();

+ 12 - 10
pages/index/index.vue

@@ -9,7 +9,7 @@
 			
 				<view slot="default" style="display: flex;">
 					<view style="flex:1;margin-left:25px;">
-						<text>我要什么</text>
+						<text :style="{fontSize:(wxFontSize)+'px'}">我要什么</text>
 					</view>
 					<view>
 						<text class="tn-icon-add-fill" style="font-size: 30px;margin-right: 4px;"
@@ -31,7 +31,7 @@
 			
 				<view slot="default" style="display: flex;">
 					<view style="flex:1;margin-left:25px">
-						<text>我有什么</text>
+						<text :style="{fontSize:(wxFontSize)+'px'}">我有什么</text>
 					</view>
 					<view>
 						<text class="tn-icon-add-fill" style="font-size: 30px;margin-right: 4px;"
@@ -54,7 +54,7 @@
 			</scroll-view>
 		</view>
 		<Auth ref="authRef"></Auth>
-		<tn-tabbar v-model="currentIndex" :list="tabbarList" activeColor="#1d60b1" inactiveColor="#AAAAAA"
+		<tn-tabbar v-model="currentIndex" :iconSize="wxFontSize+23" :fontSize="wxFontSize+6" :list="tabbarList" activeColor="#1d60b1" inactiveColor="#AAAAAA"
 			activeIconColor="#1d60b1" :animation="true" :safeAreaInsetBottom="true" @change="switchTabbar"></tn-tabbar>
 			<canvas type="2d" id="myCanvas" style="width: 450px; height: 450px;left:9000px;position:fixed;"></canvas>
 		
@@ -108,10 +108,14 @@
 				currentIndex: 0,
 				// 自定义底栏对应页面的加载情况
 				tabberPageLoadFlag: [],
-				shareData:{}
+				shareData:{},
+				wxFontSize:17
 			}
 		},
 		onLoad(options) {
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			
 			const index = Number(options.index || 0)
 			// 根据底部tabbar菜单列表设置对应页面的加载情况
 			this.tabberPageLoadFlag = this.tabbarList.map((item, tabbar_index) => {
@@ -120,7 +124,7 @@
 			this._freshing = false;
 			this.switchTabbar(index);
 			let that = this;
-			uni.hideShareMenu();
+			uni.hideShareMenu();	
 		},
 		onShow(options){
 			if (this.currentIndex === 3&&this.$refs.mine) {
@@ -166,9 +170,7 @@
 			}else{
 				uni.removeStorageSync('nextPage')
 			}
-			
-			
-			
+
 			if (wx.canIUse('getUpdateManager')) {
 			  const updateManager = wx.getUpdateManager();
 			  updateManager && updateManager.onCheckForUpdate((res) => {
@@ -248,14 +250,14 @@
 						title: '请登录',
 						icon:'none'
 					})
-					uni.setStorageSync('nextPage',this.currentIndex === 0?'/circlePages/circle':'/circlePages/addShare');
+					uni.setStorageSync('nextPage',this.currentIndex === 1?'/circlePages/circle':'/circlePages/addShare');
 					uni.navigateTo({
 						url: '/pages/login/login'
 					})
 					return false;
 				} else {
 					uni.navigateTo({
-						url: this.currentIndex === 0?'/circlePages/circle':'/circlePages/addShare'
+						url: this.currentIndex === 1?'/circlePages/circle':'/circlePages/addShare'
 					})
 				}
 				//未登录,去登录

+ 8 - 5
pages/login/info.vue

@@ -8,7 +8,7 @@
 
 			<view slot="default" style="display: flex;">
 				<view style="flex:1;margin-left:25px">
-					<text>服务协议</text>
+					<text :style="{fontSize:(wxFontSize)+'px'}">服务协议</text>
 				</view>
 
 
@@ -17,7 +17,7 @@
 		</tn-nav-bar>
 
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px', margin:'0 20px'}">
-			<rich-text :nodes="strings"></rich-text>
+			<rich-text :nodes="strings" :style="{fontSize:(wxFontSize+1)+'px'}"></rich-text>
 		</view>
 
 
@@ -26,13 +26,13 @@
 
 		<view class="tn-flex tn-footerfixed" v-if="!counted">
 			<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-				<button type="default" plain="true" style="border-radius: 24px;" @click="goBack()">
+				<button type="default" plain="true" style="border-radius: 24px;" @click="goBack()" :style="{fontSize:(wxFontSize-2)+'px'}">
 					返回
 				</button>
 			</view>
 			<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center" style="flex:2">
 				<button :disabled="counting" type="primary" style="background-color:#1d60b1;border-radius: 23px"
-					@click="saveForm()">{{counting?'阅读'+counting+'s后才可':''}}同意</button>
+					@click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">{{counting?'阅读'+counting+'s后才可':''}}同意</button>
 			</view>
 		</view>
 
@@ -48,7 +48,8 @@
 				counted: false,
 				// 定时器
 				timer: null,
-				strings: '<div style="text-align:center;font-size:18px;font-weight:bold;padding:10px">速立保平台用户服务协议</div>' +
+				wxFontSize:17,
+				strings: '<div style="text-align:center;font-weight:bold;padding:10px">速立保平台用户服务协议</div>' +
 					'<div style="text-indent: 30px;">欢迎您使用速立保平台提供的服务!</div>' +
 					'<div style="text-indent: 30px;margin-top:4px">速立保平台用户服务协议(以下简称“本协议”)由“您”(以下或称“用户”)与速立保平台共同签署,本协议阐述条款和条件适用于您使用速立保平台(所涉域名为lx-device.com及速立保平台现在或未来开设的移动客户端、应用程序、无线端载体等)向您提供的各项服务。</div>' +
 					'<div style="text-indent: 30px;margin-top:4px" >自本协议发布之日起,速立保平台内各处所称“速立保平台用户服务协议”均指本协议。</div>' +
@@ -191,6 +192,8 @@
 			}
 		},
 		onLoad(props) {
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
 			if (props.counted) {
 				this.counting = 0;
 				this.counted = true;

+ 12 - 10
pages/login/login.vue

@@ -8,7 +8,7 @@
 		</tn-nav-bar>
 		<view style="text-align: center;padding: 80px 0">
 			<image src="../../static/logo.png" style="width: 110px; height: 100px;"></image>
-			<view style="margin: 8px 0;"><text style="font-size: 22px;font-weight: bold;">速立保</text></view>
+			<view style="margin: 8px 0;"><text style="font-size: 22px;font-weight: bold;" :style="{fontSize:(wxFontSize+5)+'px'}">速立保</text></view>
 		</view>
 
 		<view :class="!agreeValue?'':'isHidden'" style="background: #00000088;
@@ -16,15 +16,15 @@
     padding: 4px 10px;
     border-radius: 12px;
     border-bottom-left-radius: 0;
-    color: #fff;font-size: 12px;margin-left: 12px;">
+    color: #fff;font-size: 12px;margin-left: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">
 			请先阅读并同意协议
 		</view>
 
 		<view style="margin-top:4px">
-			<tn-checkbox v-model="agreeValue" activeColor="#1d60b1" name="选项1">
-				阅读并同意
+			<tn-checkbox v-model="agreeValue" activeColor="#1d60b1" :size="wxFontSize+17" name="选项1"  >
+				<text :style="{fontSize:(wxFontSize-2)+'px'}">阅读并同意</text>
 			</tn-checkbox>
-			<view style="display: inline;font-size: 15px;" @click="showInfo()">
+			<view style="display: inline;font-size: 15px; margin-left: -12px;vertical-align: middle;" @click="showInfo()" :style="{fontSize:(wxFontSize-2)+'px'}">
 				<view style="color: #1d60b1;display: inline;">《用户服务协议》</view>
 				<view style="display: inline;color: #1d60b1;" @click="showInfo2()">《隐私政策》</view>
@@ -34,13 +34,13 @@
 
 		<view class="" hover-class="button-hover" style="margin-top: 24px;" v-if="agreeValue">
 			<button :disabled="!canSave" style="border-radius: 50rpx;width: 100%;background-color: #1d60b1;" type="primary" open-type="getPhoneNumber"
-				@getphonenumber="getPhoneNumber">手机号快捷登录</button>
+				@getphonenumber="getPhoneNumber" :style="{fontSize:(wxFontSize-2)+'px'}">手机号快捷登录</button>
 		</view>
 		<view class=""  hover-class="button-hover" style="margin-top: 24px;" v-if="!agreeValue">
-			<button :disabled="!canSave" style="border-radius: 50rpx;width: 100%;background-color: #1d60b1;" type="primary" @click="showToast">手机号快捷登录</button>
+			<button :disabled="!canSave" style="border-radius: 50rpx;width: 100%;background-color: #1d60b1;" type="primary" @click="showToast" :style="{fontSize:(wxFontSize-2)+'px'}">手机号快捷登录</button>
 		</view>
 		
-		<view @click="showLogin" style="text-align: center;margin-top: 24px;">验证码登录</view>
+		<view @click="showLogin" style="text-align: center;margin-top: 24px;" :style="{fontSize:(wxFontSize-4)+'px'}">验证码登录</view>
 
 
 	</view>
@@ -63,11 +63,13 @@
 				unionid: '',
 				canSave:true,
 				phoneNum:'',
-				tryTime:0
+				tryTime:0,
+				wxFontSize: 17
 			}
 		},
 		onLoad() {
-
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
 			// this.getLxSessionKey()
 		},
 		onShow(){

+ 20 - 23
pages/login/loginByCode.vue

@@ -8,45 +8,38 @@
 		</tn-nav-bar>
 		<view style="text-align: center;padding: 80px 0">
 			<image src="../../static/logo.png" style="width: 110px; height: 100px;"></image>
-			<view style="margin: 8px 0;"><text style="font-size: 22px;font-weight: bold;">速立保</text></view>
+			<view style="margin: 8px 0;"><text style="font-size: 22px;font-weight: bold;" :style="{fontSize:(wxFontSize+5)+'px'}">速立保</text></view>
 		</view>
 		
 		
-		<uni-forms ref="baseForm" :modelValue="baseFormData">
-			<uni-forms-item label="手机号" required>
-				<uni-easyinput type="number" v-model="baseFormData.userName" :clearable="false" placeholder="请输入手机号" />
+		<uni-forms ref="baseForm" :modelValue="baseFormData" :label-width="wxFontSize+70">
+			<uni-forms-item label="手机号" required :labelFontSize="wxFontSize-2">
+				<uni-easyinput type="number" :inputSize="wxFontSize-3" :placeholder-style="styleString" v-model="baseFormData.userName" :clearable="false" placeholder="请输入手机号" />
 			</uni-forms-item>
-			<uni-forms-item label="验证码" required>
-				<uni-easyinput v-model="baseFormData.code"  :clearable="false" placeholder="请输入验证码" >
+			<uni-forms-item label="验证码" required :labelFontSize="wxFontSize-2">
+				<uni-easyinput v-model="baseFormData.code" :inputSize="wxFontSize-3" :placeholder-style="styleString" :clearable="false" placeholder="请输入验证码" >
 					<template #right>
-							<view @click="getCode" style="margin-right: 4px;background: #ddd;padding: 4px 10px;border-radius: 14px;">{{seconds?seconds+'s后重新获取':'获取验证码'}}</view>
+							<view @click="getCode" style="margin-right: 4px;background: #ddd;padding: 4px 10px;border-radius: 14px;" :style="{fontSize:(wxFontSize-3)+'px'}">{{seconds?seconds+'s后重新获取':'获取验证码'}}</view>
 						</template>
 				</uni-easyinput>
 			</uni-forms-item>
 		</uni-forms>
 		
-		
-		
-		
-		
-		
-		
-		
 
 		<view :class="!agreeValue?'':'isHidden'" style="background: #00000088;
     display: inline;
     padding: 4px 10px;
     border-radius: 12px;
     border-bottom-left-radius: 0;
-    color: #fff;font-size: 12px;margin-left: 12px;">
+    color: #fff;font-size: 12px;margin-left: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">
 			请先阅读并同意协议
 		</view>
 
 		<view style="margin-top:4px">
-			<tn-checkbox v-model="agreeValue" activeColor="#1d60b1" name="选项1">
-				阅读并同意
+			<tn-checkbox v-model="agreeValue" activeColor="#1d60b1" name="选项1" :size="wxFontSize+17">
+				<text :style="{fontSize:(wxFontSize-2)+'px'}">阅读并同意</text>
 			</tn-checkbox>
-			<view style="display: inline;font-size: 15px;" @click="showInfo()">
+			<view style="display: inline;font-size: 15px;margin-left: -12px;vertical-align: middle;" @click="showInfo()" :style="{fontSize:(wxFontSize-2)+'px'}">
 				<view style="color: #1d60b1;display: inline;">《用户服务协议》</view>
 				<view style="display: inline;color: #1d60b1;" @click="showInfo2()">《隐私政策》</view>
@@ -55,13 +48,13 @@
 		</view>
 
 		<view class="" hover-class="button-hover" style="margin-top: 24px;" v-if="agreeValue">
-			<button :disabled="!canSave" style="border-radius: 50rpx;width: 100%;background-color: #1d60b1;" type="primary" @click="saveForm">登录</button>
+			<button :disabled="!canSave" style="border-radius: 50rpx;width: 100%;background-color: #1d60b1;" type="primary" @click="saveForm" :style="{fontSize:(wxFontSize-2)+'px'}">登录</button>
 		</view>
 		<view class=""  hover-class="button-hover" style="margin-top: 24px;" v-if="!agreeValue">
-			<button :disabled="!canSave" style="border-radius: 50rpx;width: 100%;background-color: #1d60b1;" type="primary" @click="showToast">登录</button>
+			<button :disabled="!canSave" style="border-radius: 50rpx;width: 100%;background-color: #1d60b1;" type="primary" @click="showToast" :style="{fontSize:(wxFontSize-2)+'px'}">登录</button>
 		</view>
 		
-		<view @click="showLogin" style="text-align: center;margin-top: 24px;">手机号快捷登录</view>
+		<view @click="showLogin" style="text-align: center;margin-top: 24px;" :style="{fontSize:(wxFontSize-4)+'px'}">手机号快捷登录</view>
 
 
 	</view>
@@ -88,11 +81,15 @@
 				unionid: '',
 				canSave:true,
 				seconds:0,
-				tryTime:0
+				tryTime:0,
+				wxFontSize: 17,
+				styleString:'font-size:'+14+'px'
 			}
 		},
 		onLoad() {
-
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			this.styleString='font-size:'+(this.wxFontSize-3)+'px';
 		},
 		onShow(){
 			if(uni.getStorageSync('agreeInfo')){

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 11 - 7
pages/mine/about.vue


+ 10 - 15
pages/mine/addFeed.vue

@@ -8,12 +8,12 @@
 
 			<view slot="default" style="display: flex;">
 				<view style="flex:1;">
-					<text>问题反馈</text>
+					<text :style="{fontSize:(wxFontSize)+'px'}">问题反馈</text>
 				</view>
 				
 				<view @click="showHis" style="margin-right:10px">
-					<text class='tn-icon-time'></text>
-					历史反馈
+					<text class='tn-icon-time' :style="{fontSize:(wxFontSize-1)+'px'}"></text>
+					<text :style="{fontSize:(wxFontSize)+'px'}">历史反馈</text>
 				</view>
 
 			</view>
@@ -22,7 +22,7 @@
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 
 			<view style="display: flex;line-height: 37px;padding: 16px;">
-				<view style="margin-right: 8px;">问题类型</view>
+				<view style="margin-right: 8px;" :style="{fontSize:(wxFontSize-2)+'px'}">问题类型</view>
 				<view style="flex:1"><uni-data-select :clear="false" v-model="typeValue" :localdata="range" @change="change"></uni-data-select></view>
 				
 
@@ -37,18 +37,13 @@
 				 <view class="tn-margin-left tn-padding-top-xs">
 				 	<uni-file-picker
 				 		v-model="imgList" :limit="6" :auto-upload="false" @select="select" @success="success">
-				 		 
-				 	   
 				 	</uni-file-picker>
 			    </view>
 			<view style="display: flex;line-height: 37px;padding: 16px;">
-				<view style="margin-right: 8px;">联系方式</view>
+				<view style="margin-right: 8px;" :style="{fontSize:(wxFontSize-2)+'px'}">联系方式</view>
 				<view style="flex:1">
-					<uni-easyinput  v-model="contactMethod" :clearable="false" placeholder="请填写您的手机号,以便我们联系您"></uni-easyinput>
-					
+					<uni-easyinput  :style="{fontSize:(wxFontSize-2)+'px'}" v-model="contactMethod" :clearable="false" placeholder="请填写您的手机号,以便我们联系您"></uni-easyinput>
 				</view>
-				
-
 			</view>
 
 		</view>
@@ -57,9 +52,7 @@
 			 
 			<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
 				<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="saveForm()">提交</button>
-				<!-- <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold @click="saveForm()">
-					<text class="tn-color-white">提交</text>
-				</tn-button> -->
+				 
 			</view>
 		</view>
 
@@ -102,6 +95,7 @@
 					},
 				],
 				showEmpty: false,
+				wxFontSize:17
 			}
 		},
 		filters: {
@@ -247,7 +241,8 @@
 			}
 		},
 		onLoad() {
-			 
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
 		}
 	}
 </script>

+ 18 - 49
pages/mine/coll.vue

@@ -6,13 +6,13 @@
 
 			</view>
 			<view slot="default">
-				<text>我的收藏</text>
+				<text :style="{fontSize:(wxFontSize)+'px'}">我的收藏</text>
 			</view>
 		</tn-nav-bar>
 
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 			<uv-sticky  :offsetTop="vuex_custom_bar_height + 'px'" bgColor="#ffffff">
-			<tn-tabs-swiper :list="list" :isScroll="false" :current="current" name="tab-name" @change="change" style="border-bottom: 1rpx solid #f1f1f1cc;"></tn-tabs-swiper>
+			<tn-tabs-swiper :list="list" :isScroll="false" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50" :current="current" name="tab-name" @change="change" style="border-bottom: 1rpx solid #f1f1f1cc;"></tn-tabs-swiper>
 			</uv-sticky>
 		
 
@@ -29,7 +29,7 @@
 													</tn-avatar>
 												</view> -->
 										<view class="tn-padding-right tn-text-ellipsis">
-											<view class="tn-padding-right tn-text-bold tn-text-lg">
+											<view class="tn-padding-right tn-text-bold tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
 												{{ item.company||(item.contactNickName||item.contactPerson) }}
 											</view>
 
@@ -43,70 +43,34 @@
 				padding: 8px;
 				color: #0000FF;
 				border-radius: 24px;
-				border-top-right-radius: 0;">{{item.validDate}}</text>
+				border-top-right-radius: 0;" :style="{fontSize:(wxFontSize-6)+'px'}">{{item.validDate}}</text>
 							</view>
 						</view>
 
 						<view
 							class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
 							 >
-							<!-- <view v-for="(label_item,label_index) in item.label" :key="label_index"
-										class="blogger__desc__label tn-float-left tn-margin-right">
-										<text class="blogger__desc__label--prefix tn-icon-topics-fill"></text>
-										<text class="tn-text-df">{{ label_item }}</text>
-									</view> -->
+						
 							<!-- 不用限制长度了,因为发布的时候限制长度了-->
-							<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="item.brand" fontColor="#3a96d7" shape="circle">{{ item.brand }}</tn-tag>
+							<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="item.brand" fontColor="#3a96d7" shape="circle"  :fontSize="wxFontSize+11">{{ item.brand }}</tn-tag>
 							 
 							<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="!item.company"
-								fontColor="#3a96d7" shape="circle">个人</tn-tag> 				
+								fontColor="#3a96d7" shape="circle"  :fontSize="wxFontSize+11">个人</tn-tag> 				
 							<text
-								class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df">{{ item.content }}</text>
+								class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
 						</view>
 
-						<!-- 内容太多疲劳了-->
-						<!-- <view
-				      v-if="item.content"
-				      class="blogger__content"
-				      :id="`blogger__content--${index}`"
-				    >
-				      <view
-				        class="blogger__content__data clamp-text-2">
-				        {{ item.content }}
-				      </view>
-				    </view> -->
-					
+						
 					<!-- 内容太多疲劳了-->
 					<view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
 						:id="`blogger__content--${index}`">
 					
-						<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true"
+						<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true"  :fontSize="(wxFontSize-3)"
 							:stripe="true" :data="item.shareExt">
 					
 						</basic-table>
 					</view>
 					
-						<!-- 内容太多疲劳了-->
-						<!-- <view
-						  v-if="item.shareExt&&item.shareExt.length>0"
-						  class="blogger__content"
-						  :id="`blogger__content--${index}`"
-						>
-						  <uni-table border stripe emptyText="暂无更多数据" >
-							 
-							<uni-tr>
-								<uni-th align="center">产品名称1</uni-th>
-								<uni-th align="center">规格型号</uni-th>
-								<uni-th align="left">产品介绍</uni-th>
-							</uni-tr>
-							 
-							<uni-tr v-for="extItem in item.shareExt">
-								<uni-td>{{extItem.prodName}}</uni-td>
-								<uni-td>{{extItem.prodSpec}}</uni-td>
-								<uni-td>{{extItem.prodDesc}}</uni-td>
-							</uni-tr>
-						  </uni-table>
-						</view> -->
 
 						<block v-if="item.imgList">
 							<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs"
@@ -140,8 +104,8 @@ aspectFill		:src="image_item.ftpUrl" mode="aspectFill" @click="showImg(item.imgL
 						
 						<view v-for="file in item.fileDetailList" :key="file.id" v-if="!isImage(file.fileName)">
 							<view>
-								<text class="tn-icon-link"></text>
-								<view style="display: inline-block;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)">
+								<text class="tn-icon-link" :style="{fontSize:(wxFontSize-4)+'px'}"></text>
+								<view style="display: inline;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)" :style="{fontSize:(wxFontSize-3)+'px'}">
 									{{file.fileName}}
 								</view>
 
@@ -151,7 +115,7 @@ aspectFill		:src="image_item.ftpUrl" mode="aspectFill" @click="showImg(item.imgL
 
 						<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
 							<view class="justify-content-item tn-color-gray tn-text-center">
-								<view class="tn-padding-right   tn-padding-top-xs tn-color-gray">
+								<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" :style="{fontSize:(wxFontSize-3)+'px'}">
 									{{ item.createTime2|formatDate }}
 								</view>
 
@@ -287,6 +251,7 @@ import {
 					fieldDesc: '产品介绍',
 				
 				}],
+				wxFontSize:17
 			}
 		},
 		filters: {
@@ -313,6 +278,10 @@ import {
 			},
 
 
+		},
+		onLoad(){
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
 		},
 		onShow() {
 			if(!uni.getStorageSync('userNo')){

+ 12 - 36
pages/mine/feedback.vue

@@ -8,7 +8,7 @@
 
 			<view slot="default" style="display: flex;">
 				<view style="flex:1;margin-left:25px">
-					<text>我的反馈</text>
+					<text :style="{fontSize:(wxFontSize)+'px'}">我的反馈</text>
 				</view>
 
 			</view>
@@ -25,12 +25,8 @@
 						<view class="justify__author__info">
 							<view class="tn-flex tn-flex-row-center">
 								<view class="tn-flex tn-flex-row-center tn-flex-col-center">
-									<!-- <view class="">
-												<tn-avatar class="" shape="circle" :src="item.userAvatar" size="lg">
-												</tn-avatar>
-											</view> -->
 									<view class="tn-padding-right tn-text-ellipsis">
-										<view class="tn-padding-right tn-text-bold tn-text-lg">
+										<view class="tn-padding-right tn-text-bold tn-text-lg" :style="{fontSize:(wxFontSize)+'px'}">
 											{{ item.type==1?'【汇报系统故障】':item.type==2?'【平台机制咨询】':item.type==3?'【投诉】':item.type==5?'【平台用户举报】':'【其他】' }}
 										</view>
 									</view>
@@ -38,55 +34,32 @@
 							</view>
 						</view>
 						<view 
-							class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
+							class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center" >
 							<text class="" v-if="item.status==1" style="background: #3F51B542;font-size: 12px;
 			padding: 8px;
 			color: red;
 			border-radius: 24px;
-			 ">已处理</text><text class="" v-if="item.status==0" style="background: #3F51B542;font-size: 12px;
+			 " :style="{fontSize:(wxFontSize-6)+'px'}">已处理</text><text class="" v-if="item.status==0" style="background: #3F51B542;font-size: 12px;
 			padding: 8px;
 			color: #333333;
 			border-radius: 24px;
-			 ">未处理</text>
+			 " :style="{fontSize:(wxFontSize-6)+'px'}">未处理</text>
 						</view>
 					</view>
 
 					<view
 						class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left">
-						<!-- <view v-for="(label_item,label_index) in item.label" :key="label_index"
-									class="blogger__desc__label tn-float-left tn-margin-right">
-									<text class="blogger__desc__label--prefix tn-icon-topics-fill"></text>
-									<text class="tn-text-df">{{ label_item }}</text>
-								</view> -->
-						<!-- 不用限制长度了,因为发布的时候限制长度了-->
 						<text
-							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df">{{ item.content }}</text>
+							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-1)+'px'}">{{ item.content }}</text>
 							
 					</view>
 					<view v-if="item.ansowe"
 						class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left">
-						<!-- <view v-for="(label_item,label_index) in item.label" :key="label_index"
-									class="blogger__desc__label tn-float-left tn-margin-right">
-									<text class="blogger__desc__label--prefix tn-icon-topics-fill"></text>
-									<text class="tn-text-df">{{ label_item }}</text>
-								</view> -->
-						<!-- 不用限制长度了,因为发布的时候限制长度了-->
 						<text
-							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" style="color:red">回复:{{ item.ansowe }}</text>
+							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" style="color:red" :style="{fontSize:(wxFontSize-2)+'px'}">回复:{{ item.ansowe }}</text>
 							
 					</view>
-
-					<!-- 内容太多疲劳了-->
-					<!-- <view
-			      v-if="item.content"
-			      class="blogger__content"
-			      :id="`blogger__content--${index}`"
-			    >
-			      <view
-			        class="blogger__content__data clamp-text-2">
-			        {{ item.content }}
-			      </view>
-			    </view> -->
+ 
 
 					<block v-if="item.imgList">
 						<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs"
@@ -123,7 +96,7 @@
 
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
 						<view class="justify-content-item tn-color-gray tn-text-center">
-							<view class="tn-padding-right   tn-padding-top-xs tn-color-gray">
+							<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" :style="{fontSize:(wxFontSize-3)+'px'}">
 								{{ item.createTime|formatDate }}
 							</view>
 
@@ -183,6 +156,7 @@
 				showHistory: false,
 				content: [],
 				showEmpty: false,
+				wxFontSize:17
 			}
 		},
 		filters: {
@@ -284,6 +258,8 @@
 			},
 		},
 		onLoad() {
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
 			this.loadData();
 		}
 	}

+ 91 - 33
pages/mine/mine.vue

@@ -3,7 +3,6 @@
 
     <!-- 顶部自定义导航 -->
     
-    
     <view class="top-backgroup">
       <image src='../../static/bg4.png' mode='widthFix' class='backgroud-image'></image>
     </view>
@@ -29,10 +28,10 @@
       </view>
       
       <!-- 没有授权,则显示这个授权按钮-->
-      <view class="tn-flex tn-flex-row-between" @click="tn('/pages/login/login')" v-if="showLogin">
+      <view class="tn-flex tn-flex-row-between" @click="toLogin('/pages/login/login')" v-if="showLogin">
         <view class="tn-flex-1 justify-content-item tn-margin-xs tn-text-center">
           <tn-button shape="round" backgroundColor="#1d60b1" fontColor="#ffffff" padding="20rpx 0" width="40%" shadow>
-            <text class="">立即登录</text>
+            <text class="" :style="{fontSize:(wxFontSize-3)+'px'}">立即登录</text>
           </tn-button>
         </view>
       </view>
@@ -40,7 +39,7 @@
 	  <view class="about-shadow tn-margin-top-lg tn-padding-top-sm tn-padding-bottom-sm tn-bg-white" v-if="!showLogin">
 	    <view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm"  @click="tn('/minePages/set')">
 	      <view class="justify-content-item">
-	        <view class="" style="font-size: 16px;">
+	        <view class="" style="font-size: 16px;" :style="{fontSize:(wxFontSize)+'px'}">
 	          个人信息
 	        </view>
 	        
@@ -54,13 +53,13 @@
 	    </view>
 		<view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm">
 		  <view class="justify-content-item">
-		    <view class="" style="font-size: 16px;">
+		    <view class="" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">
 		      用户名
 		    </view>
 		    
 		  </view>
 		  <view class="justify-content-item tn-text-lg tn-color-grey">
-		    <view class="tn-color-gray tn-padding-top-xs">
+		    <view class="tn-color-gray tn-padding-top-xs" :style="{fontSize:(wxFontSize-2)+'px'}">
 		      {{personInfo.userRealName||personInfo.contactNickName||(personInfo.userName?'用户'+personInfo.userName.slice(-4):'')||'未登录'}}
 		    </view>
  
@@ -68,13 +67,13 @@
 		</view>
 		<view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm" @click="showModal1">
 		  <view class="justify-content-item">
-		    <view class="" style="font-size: 16px;">
+		    <view class="" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">
 		      联系方式
 		    </view>
 		    
 		  </view>
 		  <view class="justify-content-item tn-text-lg tn-color-grey">
-		    <view class="tn-color-gray tn-padding-top-xs">
+		    <view class="tn-color-gray tn-padding-top-xs" :style="{fontSize:(wxFontSize-2)+'px'}">
 		       {{personInfo.contactMethod||personInfo.userName||''}}
 		    </view>
 		 
@@ -83,13 +82,13 @@
 		
 		<view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm" @click="showModal1">
 		  <view class="justify-content-item">
-		    <view class="" style="font-size: 16px;">
+		    <view class="" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">
 		      手机号
 		    </view>
 		    
 		  </view>
 		  <view class="justify-content-item tn-text-lg tn-color-grey">
-		    <view class="tn-color-gray tn-padding-top-xs">
+		    <view class="tn-color-gray tn-padding-top-xs" :style="{fontSize:(wxFontSize-2)+'px'}">
 		     {{personInfo.userName||'未登录'}}
 		    </view>
 		 
@@ -118,9 +117,9 @@
        
       
       <!-- 方式15 start-->
-      <view class="tn-flex tn-flex-row-between tn-bg-white about-shadow tn-margin-top-xl">
-        <view class="tn-padding-sm tn-margin-xs" @click="tn('/pages/mine/need')">
-          <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center tn-margin-left">
+      <view class="tn-flex tn-flex-row-between tn-bg-white about-shadow tn-margin-top-xl" style="padding-left: 12px;padding-right: 12px;">
+        <view class="tn-padding-sm" @click="tn('/pages/mine/need')">
+          <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
             <view class="icon15__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur" style="background-color: #F3F2F7;color: #7C8191;position: relative;">
               <!-- <tn-badge absolute="true" v-if="needNum>0">
 				<span style="color: #fff;font-size: 11px;
@@ -134,11 +133,11 @@
 			  <view class="tn-icon-like"></view>
             </view>  
             <view class="tn-text-center">
-              <text class="tn-text-ellipsis">我的需求</text>
+              <text class="tn-text-ellipsis" :style="{fontSize:(wxFontSize)+'px'}">我的需求</text>
             </view>
           </view>
         </view>
-        <view class="tn-padding-sm tn-margin-xs" @click="tn('/pages/mine/share')">
+        <view class="tn-padding-sm" @click="tn('/pages/mine/share')">
           <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
             <view class="icon15__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur" style="background-color: #F3F2F7;color: #7C8191;position: relative;">
               <!-- <tn-badge absolute="true" v-if="shareNum>0">
@@ -153,17 +152,17 @@
 			  <view class="tn-icon-share-triangle"></view>
             </view>  
             <view class="tn-text-center">
-              <text class="tn-text-ellipsis">我的供应</text>
+              <text class="tn-text-ellipsis" :style="{fontSize:(wxFontSize)+'px'}">我的供应</text>
             </view>
           </view>
         </view>
-        <view class="tn-padding-sm tn-margin-xs" @click="tn('/pages/mine/coll')">
-          <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center tn-margin-right">
+        <view class="tn-padding-sm" @click="tn('/pages/mine/coll')">
+          <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
             <view class="icon15__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur" style="background-color: #F3F2F7;color: #7C8191;">
               <view class="tn-icon-star"></view>
             </view>  
             <view class="tn-text-center">
-              <text class="tn-text-ellipsis">我的收藏</text>
+              <text class="tn-text-ellipsis" :style="{fontSize:(wxFontSize)+'px'}">我的收藏</text>
             </view>
           </view>
         </view>
@@ -181,10 +180,10 @@
           <button class="tn-flex tn-flex-col-center tn-button--clear-style" @click="showFeedback">
             <view
               class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-              <view class="tn-icon-message-fill"></view>
+              <view class="tn-icon-message-fill" :style="{fontSize:(wxFontSize)+'px'}"></view>
             </view>
             <view class="tn-flex tn-flex-row-between" style="width: 100%;">
-              <view class="tn-margin-left-sm">我有问题</view>
+              <view class="tn-margin-left-sm" :style="{fontSize:(wxFontSize-1)+'px'}">我有问题</view>
               <view class="tn-color-gray tn-icon-right"></view>
             </view>
           </button>
@@ -193,9 +192,9 @@
 		  <view class="tn-flex tn-flex-col-center">
 		    <view
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-		      <view class="tn-icon-safe-fill"></view>
+		      <view class="tn-icon-safe-fill" :style="{fontSize:(wxFontSize)+'px'}"></view>
 		    </view>
-		    <view class="tn-margin-left-sm tn-flex-1">用户声明</view>
+		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">用户声明</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
 		  </view>
 		</tn-list-cell>
@@ -203,9 +202,9 @@
 		  <view class="tn-flex tn-flex-col-center">
 		    <view
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-		      <view class="tn-icon-lock"></view>
+		      <view class="tn-icon-lock" :style="{fontSize:(wxFontSize)+'px'}"></view>
 		    </view>
-		    <view class="tn-margin-left-sm tn-flex-1">隐私协议</view>
+		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">隐私协议</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
 		  </view>
 		</tn-list-cell>
@@ -213,9 +212,19 @@
 		  <view class="tn-flex tn-flex-col-center">
 		    <view
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-		      <view class="tn-icon-help"></view>
+		      <view class="tn-icon-help" :style="{fontSize:(wxFontSize)+'px'}"></view>
 		    </view>
-		    <view class="tn-margin-left-sm tn-flex-1">了解速立保</view>
+		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">了解速立保</view>
+		    <view class="tn-color-gray tn-icon-right"></view>
+		  </view>
+		</tn-list-cell>
+		<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click=showFont()>
+		  <view class="tn-flex tn-flex-col-center">
+		    <view
+		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
+		      <view class="tn-icon-font" :style="{fontSize:(wxFontSize)+'px'}"></view>
+		    </view>
+		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">字体大小</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
 		  </view>
 		</tn-list-cell>
@@ -223,9 +232,9 @@
 		  <view class="tn-flex tn-flex-col-center">
 		    <view
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-		      <view class="tn-icon-my-reduce"></view>
+		      <view class="tn-icon-my-reduce" :style="{fontSize:(wxFontSize)+'px'}"></view>
 		    </view>
-		    <view class="tn-margin-left-sm tn-flex-1">注销账户</view>
+		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">注销账户</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
 		  </view>
 		</tn-list-cell>
@@ -238,9 +247,9 @@
 	  		  <view class="tn-flex tn-flex-col-center">
 	  		    <view
 	  		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-	  		      <view class="tn-icon-logout"></view>
+	  		      <view class="tn-icon-logout" :style="{fontSize:(wxFontSize)+'px'}"></view>
 	  		    </view>
-	  		    <view class="tn-margin-left-sm tn-flex-1">退出登录</view>
+	  		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">退出登录</view>
 	  		    <view class="tn-color-gray tn-icon-right"></view>
 	  		  </view>
 	  		</tn-list-cell>
@@ -270,11 +279,14 @@
 		  showLogin: false,
 		  msgType:'',
 		  shareNum:0,
-		  needNum:0
+		  needNum:0,
+		  wxFontSize:17,
       }
     },
 	onReady() {
-		 
+	  const appBaseInfo = wx.getAppBaseInfo();
+	  this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+	  console.warn(this.wxFontSize===20);
 	  this.$nextTick(() => {
 		  if(!uni.getStorageSync('userNo')){
 		  	this.showLogin = true;
@@ -340,6 +352,47 @@
 	   			  }
 	   		   })
 	   },
+	   showFont(){
+		   let that = this;
+		   uni.showActionSheet({
+		   	itemList: ['跟随微信','小','中','大'],
+		   	success: function (res) {
+				if(res.tapIndex==1){
+					uni.setStorageSync('fontSize',16)
+					that.wxFontSize = 16;
+					uni.reLaunch({
+						url:'/pages/index/index?index=3'
+					})
+				}
+				if(res.tapIndex==2){
+					// uni.removeStorageSync('fontSize');
+					uni.setStorageSync('fontSize',17)
+					that.wxFontSize = 17;
+					uni.reLaunch({
+						url:'/pages/index/index?index=3'
+					})
+				}
+				if(res.tapIndex==3){
+					uni.setStorageSync('fontSize',20)
+					that.wxFontSize = 20;
+					uni.reLaunch({
+						url:'/pages/index/index?index=3'
+					})
+				}
+				if(res.tapIndex==0){
+					const appBaseInfo = wx.getAppBaseInfo();
+					uni.removeStorageSync('fontSize');
+					that.wxFontSize = appBaseInfo.fontSizeSetting||17;
+					uni.reLaunch({
+						url:'/pages/index/index?index=3'
+					})
+				}
+		   	},
+		   	fail: function (res) {
+		   		console.log(res.errMsg);
+		   	}
+		   });
+	   },
 	  
 
       // 跳转
@@ -355,6 +408,11 @@
           url: e,
         });
       },
+	  toLogin(e){
+		  uni.navigateTo({
+		    url: e,
+		  });
+	  },
 	  showFeedback(){
 		  uni.navigateTo({
 		    url: '/pages/mine/addFeed',

+ 17 - 32
pages/mine/need.vue

@@ -6,13 +6,13 @@
 
 			</view>
 			<view slot="default">
-				<text>我的需求</text>
+				<text :style="{fontSize:(wxFontSize)+'px'}">我的需求</text>
 			</view>
 		</tn-nav-bar>
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 			<uv-sticky :offsetTop="vuex_custom_bar_height + 'px'" bgColor="#ffffff">
 				<tn-tabs-swiper :list="list" :isScroll="false" :current="current" name="tab-name" @change="tabChange"
-					style="border-bottom: 1rpx solid #f1f1f1cc;"></tn-tabs-swiper>
+					style="border-bottom: 1rpx solid #f1f1f1cc;" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50"></tn-tabs-swiper>
 			</uv-sticky>
 
 
@@ -28,7 +28,7 @@
 											</tn-avatar>
 										</view> -->
 									<view class="tn-padding-right tn-text-ellipsis">
-										<view class="tn-padding-right tn-text-bold tn-text-lg">
+										<view class="tn-padding-right tn-text-bold tn-text-lg" :style="{fontSize:(wxFontSize)+'px'}">
 											{{ item.company }}
 										</view>
 
@@ -42,7 +42,7 @@
 		padding: 8px;
 		color: #333333;
 		border-radius: 24px;
-		 ">需求已结束</text>
+		 " :style="{fontSize:(wxFontSize-6)+'px'}">需求已结束</text>
 						</view>
 						<!-- 状态(1:暂存,2:待处理,3:审核中,4:已通过,9:已拒绝,10:已取消) -->
 						<view v-if="item.status=='1'"
@@ -51,7 +51,7 @@
 					padding: 8px;
 					color: #333333;
 					border-radius: 24px;
-					 ">暂存</text>
+					 " :style="{fontSize:(wxFontSize-6)+'px'}">暂存</text>
 						</view>
 						<view v-if="item.status=='3'"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
@@ -59,7 +59,7 @@
 						padding: 8px;
 						color: #ff0;
 						border-radius: 24px;
-						 ">审核中</text>
+						 " :style="{fontSize:(wxFontSize-6)+'px'}">审核中</text>
 							</view>
 						<view v-if="item.status=='4'&&item.showFlag!='否'"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
@@ -67,7 +67,7 @@
 						padding: 8px;
 						color: #007000;
 						border-radius: 24px;
-						 ">已通过</text>
+						 " :style="{fontSize:(wxFontSize-6)+'px'}">已通过</text>
 							</view>
 						<view v-if="item.status=='9'"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
@@ -75,7 +75,7 @@
 						padding: 8px;
 						color: #d23920;
 						border-radius: 24px;
-						 "  @click="showTips(item)">已拒绝</text>
+						 "  @click="showTips(item)" :style="{fontSize:(wxFontSize-6)+'px'}">已拒绝</text>
 							</view>
 							<view v-if="item.status=='10'"
 									class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
@@ -83,35 +83,17 @@
 							padding: 8px;
 							color: #333333;
 							border-radius: 24px;
-							 ">已取消</text>
+							 " :style="{fontSize:(wxFontSize-6)+'px'}">已取消</text>
 								</view>
 					</view>
 
 					<view
 						class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
 						@click="tn('')">
-						<!-- <view v-for="(label_item,label_index) in item.label" :key="label_index"
-								class="blogger__desc__label tn-float-left tn-margin-right">
-								<text class="blogger__desc__label--prefix tn-icon-topics-fill"></text>
-								<text class="tn-text-df">{{ label_item }}</text>
-							</view> -->
-						<!-- 不用限制长度了,因为发布的时候限制长度了-->
 						<text
-							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df">{{ item.content }}</text>
+							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
 					</view>
 
-					<!-- 内容太多疲劳了-->
-					<!-- <view
-		      v-if="item.content"
-		      class="blogger__content"
-		      :id="`blogger__content--${index}`"
-		    >
-		      <view
-		        class="blogger__content__data clamp-text-2">
-		        {{ item.content }}
-		      </view>
-		    </view> -->
-
 					<block v-if="item.imgList">
 						<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs"
 							@click="tn('')">
@@ -144,8 +126,8 @@
 					</block>
 					<view v-for="file in item.fileDetailList" :key="file.id" v-if="!isImage(file.fileName)">
 						<view>
-							<text class="tn-icon-link"></text>
-							<view style="display: inline-block;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)">
+							<text class="tn-icon-link" :style="{fontSize:(wxFontSize-4)+'px'}"></text>
+							<view style="display: inline;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)" :style="{fontSize:(wxFontSize-3)+'px'}">
 								{{file.fileName}}
 							</view>
 
@@ -158,7 +140,7 @@
 						<view class="justify-content-item tn-color-gray">
 							<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" style="display: flex;">
 								<view style="white-space: nowrap;">{{ item.createTime|formatDate }}</view>
-								<view style="color: red;margin-left:8px;" v-if="item.status==9&&item.feedback">
+								<view style="color: red;margin-left:8px;" v-if="item.status==9&&item.feedback"  :style="{fontSize:(wxFontSize-3)+'px'}">
 									反馈意见:{{item.feedback||'--'}}
 								</view>
 							</view>
@@ -222,7 +204,8 @@
 				current: 0,
 				content: [],
 				showEmpty: false,
-				curItem: {}
+				curItem: {},
+				wxFontSize:17
 			}
 		},
 		filters: {
@@ -250,6 +233,8 @@
 
 		},
 		onLoad(props){
+			const appBaseInfo = wx.getAppBaseInfo();
+		    this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
 			if(props.tab==1){
 				this.current= 1;
 			}

+ 24 - 51
pages/mine/share.vue

@@ -6,13 +6,13 @@
 
 			</view>
 			<view slot="default">
-				<text>我的供应</text>
+				<text :style="{fontSize:(wxFontSize)+'px'}">我的供应</text>
 			</view>
 		</tn-nav-bar>
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 			<uv-sticky  :offsetTop="vuex_custom_bar_height + 'px'" bgColor="#ffffff">
 			<tn-tabs-swiper :list="list" :isScroll="false" :current="current" name="tab-name"
-				@change="change"  style="border-bottom: 1rpx solid #f1f1f1cc;"></tn-tabs-swiper>
+				@change="change"  style="border-bottom: 1rpx solid #f1f1f1cc;" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50"></tn-tabs-swiper>
 		</uv-sticky>
 		<view class="tn-flex tn-flex-direction-column  tn-margin-top-sm tn-margin-bottom">
 
@@ -23,18 +23,10 @@
 						<view class="justify__author__info" @click="tn('')">
 							<view class="tn-flex tn-flex-row-center">
 								<view class="tn-flex tn-flex-row-center tn-flex-col-center">
-									<!-- <view class="">
-		                <tn-avatar
-		                  class=""
-		                  shape="circle"
-		                  :src="item.userAvatar"
-		                  size="lg">
-		                </tn-avatar>
-		              </view> -->
+									 
 									<view class="tn-padding-right tn-text-ellipsis">
-										<view class="tn-padding-right  tn-text-bold tn-text-lg">
+										<view class="tn-padding-right  tn-text-bold tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
 											{{ item.company||(item.contactNickName||item.contactPerson)}} </view>
-										<!-- <view class="tn-padding-right tn-padding-left-sm tn-padding-top-xs tn-color-gray">{{ item.date }}</view> -->
 									</view>
 								</view>
 							</view>
@@ -47,7 +39,7 @@
 									padding: 8px;
 									color: #333333;
 									border-radius: 24px;
-									 ">暂存</text>
+									 " :style="{fontSize:(wxFontSize-6)+'px'}">暂存</text>
 										</view>
 										<view v-if="item.status=='3'"
 												class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
@@ -55,7 +47,7 @@
 										padding: 8px;
 										color: #ff0;
 										border-radius: 24px;
-										 ">审核中</text>
+										 " :style="{fontSize:(wxFontSize-6)+'px'}">审核中</text>
 											</view>
 										<view v-if="item.status=='4'&&item.showFlag!='否'"
 												class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
@@ -63,7 +55,7 @@
 										padding: 8px;
 										color: #007000;
 										border-radius: 24px;
-										 ">已通过</text>
+										 " :style="{fontSize:(wxFontSize-6)+'px'}">已通过</text>
 											</view>
 										<view v-if="item.status=='9'"
 												class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
@@ -71,7 +63,7 @@
 										padding: 8px;
 										color: #d23920;
 										border-radius: 24px;
-										 "  @click="showTips(item)">已拒绝</text>
+										 "  @click="showTips(item)" :style="{fontSize:(wxFontSize-6)+'px'}">已拒绝</text>
 											</view>
 											<view v-if="item.status=='10'"
 													class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
@@ -79,7 +71,7 @@
 											padding: 8px;
 											color: #333333;
 											border-radius: 24px;
-											 ">已取消</text>
+											 " :style="{fontSize:(wxFontSize-6)+'px'}">已取消</text>
 												</view>
 									 
 						<view v-if="item.status=='4'&&item.showFlag=='否'"
@@ -88,54 +80,34 @@
 						padding: 8px;
 						color: #333333;
 						border-radius: 24px;
-						 ">已下架</text>
+						 " :style="{fontSize:(wxFontSize-6)+'px'}">已下架</text>
 									</view>
-								 
-						<!-- <view class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-		          <text class="tn-icon-more-vertical tn-color-gray tn-text-bold tn-text-xxl"></text>
-		        </view> -->
+
 					</view>
 
 					<view
 						class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
 						@click="tn('')">
-						<!-- <view v-for="(label_item,label_index) in item.label" :key="label_index" class="blogger__desc__label tn-float-left tn-margin-right">
-		          <text class="blogger__desc__label--prefix tn-icon-topics-fill"></text> 
-		          <text class="tn-text-df">{{ label_item }}</text>
-		        </view> -->
-				      <tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="item.brand" fontColor="#3a96d7" shape="circle">{{ item.brand }}</tn-tag>
+						
+				      <tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="item.brand" fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11">{{ item.brand }}</tn-tag>
 				      <tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="!item.company"
-				      	fontColor="#3a96d7" shape="circle">个人</tn-tag>
+				      	fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11">个人</tn-tag>
 				       
 						<!-- 不用限制长度了,因为发布的时候限制长度了-->
 						<text v-if="item.content"
-							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df">{{ item.content }}</text>
+							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
 					</view>
 
 					<!-- 内容太多疲劳了-->
 					<view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
 						:id="`blogger__content--${index}`">
 					
-						<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true"
+						<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true"  :fontSize="(wxFontSize-3)"
 							:stripe="true" :data="item.shareExt">
 					
 						</basic-table>
 					</view>
-					<!-- 内容太多疲劳了-->
-					<!-- <view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content" :id="`blogger__content--${index}`">
-						<uni-table border stripe emptyText="暂无更多数据">
-							<uni-tr>
-								<uni-th align="center">产品名称</uni-th>
-								<uni-th align="center">规格型号</uni-th>
-								<uni-th align="left">产品介绍</uni-th>
-							</uni-tr>
-							<uni-tr v-for="extItem in item.shareExt">
-								<uni-td>{{extItem.prodName}}</uni-td>
-								<uni-td>{{extItem.prodSpec}}</uni-td>
-								<uni-td>{{extItem.prodDesc}}</uni-td>
-							</uni-tr>
-						</uni-table>
-					</view> -->
+					 
 
 					<block v-if="item.imgList">
 						<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs"
@@ -167,8 +139,8 @@
 					</block>
 					<view v-for="file in item.fileDetailList" :key="file.id" v-if="!isImage(file.fileName)">
 						<view>
-							<text class="tn-icon-link"></text>
-							<view style="display: inline-block;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)">
+							<text class="tn-icon-link" :style="{fontSize:(wxFontSize-4)+'px'}"></text>
+							<view style="display: inline;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)" :style="{fontSize:(wxFontSize-3)+'px'}">
 								{{file.fileName}}</view>
 
 						</view>
@@ -180,7 +152,7 @@
 						<view class="justify-content-item tn-color-gray tn-text-center">
 							<view class="tn-padding-right   tn-padding-top-xs tn-color-gray"  style="display: flex;">
 								<view style="white-space: nowrap;">{{ item.createTime|formatDate }}</view>
-								<view v-if="item.status==9&&item.feedback" style="color: red;margin-left:8px;">
+								<view v-if="item.status==9&&item.feedback" style="color: red;margin-left:8px;" :style="{fontSize:(wxFontSize-3)+'px'}">
 									反馈意见:{{item.feedback||'--'}}
 								</view>
 							</view>
@@ -209,9 +181,6 @@
 			<!-- 边距间隔 -->
 			<!-- <view class="tn-strip-bottom"></view> -->
 
-			<!-- 广告 -->
-
-
 		</view>
 		</view>
 		 <tn-modal v-model="showModel" @click="clickModel" :title="titleModel" :content="contentModel" :button="buttonModel"></tn-modal>
@@ -276,6 +245,7 @@
 					fieldDesc: '产品介绍',
 				
 				}],
+				wxFontSize:17
 			}
 		},
 		filters: {
@@ -303,6 +273,9 @@
 
 		},
 		onLoad(props){
+			const appBaseInfo = wx.getAppBaseInfo();
+			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			
 			if(props.tab==1){
 				this.current= 1;
 			}

+ 11 - 4
tuniao-ui/components/tn-steps/tn-steps.vue

@@ -38,7 +38,8 @@
         v-if="mode === 'dot'"
         class="tn-steps__item__dot"
         :style="{
-          backgroundColor: currentIndex <= index ? inActiveColor : activeColor
+          backgroundColor: currentIndex <= index ? inActiveColor : activeColor,
+		  fontSize:fontSize
         }"
       ></view>
       
@@ -48,7 +49,8 @@
         class="tn-steps__item__icon"
         :class="[iconModeClass(index)]"
         :style="{
-          color: currentIndex <= index ? inActiveColor : activeColor
+          color: currentIndex <= index ? inActiveColor : activeColor,
+		  fontSize:fontSize
         }"
       ></view>
       
@@ -64,7 +66,8 @@
         class="tn-steps__item__text tn-text-ellipsis"
         :class="[`tn-steps__item__text--${direction}`]"
         :style="{
-          color: currentIndex <= index ? inActiveColor : activeColor
+          color: currentIndex <= index ? inActiveColor : activeColor,
+		  fontSize:fontSize
         }"
       >
         {{ item.name }}
@@ -130,7 +133,11 @@
       showTitle: {
         type: Boolean,
         default: true
-      }
+      },
+	  fontSize:{
+		  type: String,
+		  default: '14px'
+	  }
     },
     computed: {
       // icon模式下图标的值

+ 21 - 3
uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue

@@ -14,7 +14,7 @@
 					:class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
 					:style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
 					<checkbox class="hidden" hidden :disabled="disabled || !!item.disabled" :value="item[map.value]+''"
-						:checked="item.selected" />
+						:checked="item.selected"/>
 					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')"
 						class="checkbox__inner" :style="item.styleIcon">
 						<view class="checkbox__inner-icon"></view>
@@ -30,7 +30,7 @@
 					:class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
 					:style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
 					<radio class="hidden" hidden :disabled="disabled || item.disabled" :value="item[map.value]+''"
-						:checked="item.selected" />
+						:checked="item.selected" :style="item.styleIcon"/>
 					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="radio__inner"
 						:style="item.styleBackgroud">
 						<view class="radio__inner-icon" :style="item.styleIcon"></view>
@@ -144,6 +144,10 @@
 						value: 'value'
 					}
 				}
+			},
+			fontSize:{
+				type: String,
+				default: '14px'
 			}
 		},
 		watch: {
@@ -172,6 +176,13 @@
 				// 	this.is_reset = false
 				// 	this.formItem && this.formItem.setValue(newVal)
 				// }
+			},
+			fontSize:{
+				handler(newVal) {
+					this.fontSize = newVal;
+				},
+				deep: true
+				
 			}
 		},
 		data() {
@@ -215,7 +226,10 @@
 			// 		this.form.inputChildrens.push(this)
 			// 	}
 			// }
-
+			const appBaseInfo = wx.getAppBaseInfo();
+			let wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			this.fontSize = (wxFontSize-3)+'px';
+			
 			if (this.localdata && this.localdata.length !== 0) {
 				this.isLocal = true
 				this.range = this.localdata
@@ -421,6 +435,8 @@
 						styles['border-color'] = item.selected ? selectedColor : '#DCDFE6'
 					}
 				}
+				// styles.width = this.fontSize;
+				// styles.height = this.fontSize;
 				for (let i in styles) {
 					classles += `${i}:${styles[i]};`
 				}
@@ -440,9 +456,11 @@
 						styles.color = '#999'
 					}
 				}
+				styles['font-size'] = this.fontSize;
 				for (let i in styles) {
 					classles += `${i}:${styles[i]};`
 				}
+				console.warn(styles);
 				return classles
 			},
 			setStyleRightIcon(item) {

+ 8 - 4
uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -4,8 +4,8 @@
 		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
 			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
 				<view class="uni-select__input-box" @click="toggleSelector">
-					<view v-if="current" class="uni-select__input-text">{{textShow}}</view>
-					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<view v-if="current" class="uni-select__input-text" :style="{fontSize:fontSize}">{{textShow}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder" :style="{fontSize:fontSize}">{{typePlaceholder}}</view>
 					<view v-if="current && clear && !disabled" @click.stop="clearVal">
 						<uni-icons type="clear" color="#c0c4cc" size="24" />
 					</view>
@@ -18,11 +18,11 @@
 					<view :class="placement=='bottom'?'uni-popper__arrow_bottom':'uni-popper__arrow_top'"></view>
 					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
 						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
-							<text>{{emptyTips}}</text>
+							<text :style="{fontSize:fontSize}">{{emptyTips}}</text>
 						</view>
 						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
 							@click="change(item)">
-							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+							<text :class="{'uni-select__selector__disabled': item.disable}" :style="{fontSize:fontSize}">{{formatItemName(item)}}</text>
 						</view>
 					</scroll-view>
 				</view>
@@ -99,6 +99,10 @@
 			placement: {
 				type: String,
 				default: 'bottom'
+			},
+			fontSize:{
+				type: String,
+				default: '14px'
 			}
 		},
 		data() {

+ 8 - 3
uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue

@@ -170,6 +170,10 @@
 				type: [Number, String],
 				default: 24
 			},
+			inputSize:{
+				type: Number,
+				default: 14
+			},
 			inputBorder: {
 				type: Boolean,
 				default: true
@@ -297,6 +301,7 @@
 					'' :
 					'10px';
 				return obj2strStyle({
+					'font-size':this.inputSize+'px',
 					'padding-right': paddingRight,
 					'padding-left': this.prefixIcon ? '' : '10px'
 				});
@@ -515,7 +520,7 @@
 		position: relative;
 		text-align: left;
 		color: #333;
-		font-size: 14px;
+ 
 	}
 
 	.uni-easyinput__content {
@@ -542,7 +547,7 @@
 		overflow: hidden;
 		flex: 1;
 		line-height: 1;
-		font-size: 14px;
+
 		height: 35px;
 		// min-height: 36px;
 
@@ -581,7 +586,7 @@
 		overflow: hidden;
 		flex: 1;
 		line-height: 1.5;
-		font-size: 14px;
+		 
 		margin: 6px;
 		margin-left: 0;
 		height: 80px;

+ 5 - 1
uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue

@@ -5,7 +5,7 @@
 			<view class="uni-forms-item__label" :class="{'no-label':!label && !required}"
 				:style="{width:localLabelWidth,justifyContent: localLabelAlign}">
 				<text v-if="required" class="is-required">*</text>
-				<text>{{label}}</text>
+				<text :style="{fontSize:labelFontSize+'px'}">{{label}}</text>
 			</view>
 		</slot>
 		<!-- #ifndef APP-NVUE -->
@@ -106,6 +106,10 @@
 				type: String,
 				default: ''
 			},
+			labelFontSize:{
+				type: Number,
+				default:15
+			},
 			// 强制显示错误信息
 			errorMessage: {
 				type: [String, Boolean],

+ 9 - 5
uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue

@@ -4,13 +4,13 @@
 			@click="searchClick">
 			<view class="uni-searchbar__box-icon-search">
 				<slot name="searchIcon">
-					<uni-icons color="#c0c4cc" size="18" type="search" />
+					<uni-icons color="#c0c4cc" :size="fontSize+3" type="search" />
 				</slot>
 			</view>
 			<input v-if="show || searchVal" :focus="showSync" :disabled="readonly" :placeholder="placeholderText" :maxlength="maxlength"
-				class="uni-searchbar__box-search-input" confirm-type="search" type="text" v-model="searchVal" :style="{color:textColor}"
+				class="uni-searchbar__box-search-input" confirm-type="search" type="text" v-model="searchVal" :style="{color:textColor,fontSize:fontSize+'px'}"
 				@confirm="confirm" @blur="blur" @focus="emitFocus"/>
-			<text v-else class="uni-searchbar__text-placeholder">{{ placeholder }}</text>
+			<text v-else class="uni-searchbar__text-placeholder" :style="{fontSize:fontSize+'px'}">{{ placeholder }}</text>
 			<view v-if="show && (clearButton==='always'||clearButton==='auto'&&searchVal!=='') &&!readonly"
 				class="uni-searchbar__box-icon-clear" @click="clear">
 				<slot name="clearIcon">
@@ -19,7 +19,7 @@
 			</view>
 		</view>
 		<text @click="cancel" class="uni-searchbar__cancel"
-			v-if="cancelButton ==='always' || show && cancelButton ==='auto'">{{cancelTextI18n}}</text>
+			v-if="cancelButton ==='always' || show && cancelButton ==='auto'" :style="{fontSize:fontSize+'px'}">{{cancelTextI18n}}</text>
 	</view>
 </template>
 
@@ -110,6 +110,10 @@
 			readonly: {
 				type: Boolean,
 				default: false
+			},
+			fontSize:{
+				type:Number,
+				default: 15
 			}
 		},
 		data() {
@@ -255,7 +259,7 @@
 		flex-direction: row;
 		align-items: center;
 		height: $uni-searchbar-height;
-		padding: 5px 8px 5px 0px;
+		padding: 5px 0px 5px 0px;
 	}
 
 	.uni-searchbar__box-icon-search {

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/circlePages/addShare.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/circlePages/circle.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/basic-table/basic-table.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/w-select/w-select.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/minePages/set.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/comm/comm.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/comm/search.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/discovery/discovery.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/info.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/about.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/addFeed.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/coll.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/feedback.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/need.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/share.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-steps/tn-steps.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/circlePages/addShare.js


+ 2 - 1
unpackage/dist/dev/mp-weixin/circlePages/addShare.json

@@ -12,6 +12,7 @@
     "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
     "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
     "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item",
-    "uni-file-picker": "/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker"
+    "uni-file-picker": "/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker",
+    "tn-checkbox": "/tuniao-ui/components/tn-checkbox/tn-checkbox"
   }
 }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/circlePages/addShare.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/circlePages/circle.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/circlePages/circle.json

@@ -10,6 +10,6 @@
     "w-select": "/components/w-select/w-select",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
-    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox"
+    "tn-checkbox": "/tuniao-ui/components/tn-checkbox/tn-checkbox"
   }
 }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/circlePages/circle.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/common/runtime.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/components/basic-table/basic-table.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/components/basic-table/basic-table.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/components/w-select/w-select.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/components/w-select/w-select.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/minePages/set.js


+ 1 - 3
unpackage/dist/dev/mp-weixin/minePages/set.json

@@ -6,8 +6,6 @@
     "uni-file-picker": "/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
-    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
-    "tn-modal": "/tuniao-ui/components/tn-modal/tn-modal",
-    "tn-button": "/tuniao-ui/components/tn-button/tn-button"
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
   }
 }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/minePages/set.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/comm/comm.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/comm/comm.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/comm/search.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/comm/search.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/discovery/discovery.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/discovery/discovery.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/home/home.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/home/home.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/login/info.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/login/info.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/login/login.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/login/login.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/about.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/about.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/addFeed.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/addFeed.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/coll.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/coll.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/feedback.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/feedback.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/mine.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/need.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/need.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/share.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/share.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/tuniao-ui/components/tn-steps/tn-steps.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/tuniao-ui/components/tn-steps/tn-steps.wxml


+ 0 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels