Uniapp/lucky_shop
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'dev/1.0' of http://git.aigc-quickapp.com/Uniapp/lucky_shop into Branch_24cb3a09

Browse Source 
# Conflicts:
#	.local.config.js
This commit is contained in:
jinhhanhan
2026-08-05 15:50:36 +08:00
parent eb2839eeb8 be40bb19b3
commit 670d3f99fc
2 changed files with 132 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
components/ns-form/ns-form.vue
View File

@@ -37,12 +37,26 @@
></textarea>
<!-- #endif -->
<!-- #ifndef MP-HARMONY -->
<textarea
:placeholder="item.value.placeholder"
placeholder-class="placeholder color-tip"
v-model="item.val"
:style="inputStyle"
></textarea>
<!-- #ifdef MP-WEIXIN -->
<!-- 微信小程序原生 textarea：
不用 auto-height（会随内容无限扩展遮挡后续组件），改用 textareaStyle 中
固定 height 176rpx（约 4 行）+ line-height 44rpx，可视区域比原 88rpx 翻倍，
内容多时内部滚动条 thumb 比例改善一倍，且高度可控。 -->
<textarea
:placeholder="item.value.placeholder"
placeholder-class="placeholder color-tip"
v-model="item.val"
:style="textareaStyle"
></textarea>
<!-- #endif -->
<!-- #ifndef MP-WEIXIN -->
<textarea
:placeholder="item.value.placeholder"
placeholder-class="placeholder color-tip"
v-model="item.val"
:style="inputStyle"
></textarea>
<!-- #endif -->
<!-- #endif -->
</view>
</view>
@@ -420,6 +434,26 @@
'line-height': this.$util.rpx(this.config.inputHeight)
});
},
// textarea 专用 inline style（仅微信小程序端使用，见 template 中 #ifdef MP-WEIXIN 分支）
// 设计要点：
// 1) 不复用 inputStyle 的 min-height / line-height：这两个值取自 inputHeight（默认 60rpx），
// 对 textarea 太小，会让微信小程序原生 textarea 单行过高、可视区域过小，
// 内容稍多即溢出导致原生滚动条 thumb 异常小；
// 2) 不使用 auto-height：在微信小程序原生 textarea 上，auto-height 会让 textarea 随内容
// 无限扩展，遮挡后续组件，导致"看不到下面的其他组件"；
// 3) 改用固定 height 176rpx（约 4 行，line-height 44rpx），相比原 CSS height: 88rpx（2 行）
// 可视区域翻倍，内容多时内部滚动条 thumb 比例改善一倍，且高度可控不会遮挡后续组件。
textareaStyle() {
const h = this.$util.rpx(176);
return this.$util.objToStyle({
'height': h,
'min-height': h,
'line-height': this.$util.rpx(44),
'border-radius': this.$util.rpx(this.config.inputRadius),
'font-size': this.$util.rpx(this.config.labelFontSize),
'color': this.config.labelColor
});
},
// 必填星号颜色
requiredColor() {
return this.config.requiredColor;

174
package.json
View File

@@ -1,82 +1,92 @@
{
"scripts": {
"mp-weixin": "node scripts/mp-weixin.patch.js",
"i18n:check": "node scripts/i18n-check.js",
"test": "node scripts/test-gate.js",
"test:util": "node --test tests/util.test.js",
"prebuild": "npm run test",
"prestart": "npm run test"
},
"devDependencies": {
"dart-sass": "^1.25.0",
"terser-webpack-plugin": "^5.3.10",
"zion-uniapp-mp-load-package": "^1.0.13"
},
"dependencies": {
"jweixin-module": "^1.6.0"
},
"uni-app": {
"scripts": {
"weixin": {
"title": "微信小程序自定义发行",
"env": {
"UNI_PLATFORM": "mp-weixin"
},
"define": {
"MP_WEIXIN": true,
"PRODUCTION": true
}
},
"h5-xcx20.5g-quickapp.com": {
"title": "H5-xcx20.5g-quickapp.com",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "https://xcx20.5g-quickapp.com/"
},
"define": {
"PRODUCTION": true
}
},
"h5-xcx.aigc-quickapp.com": {
"title": "H5-xcx.aigc-quickapp.com",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "https://xcx.aigc-quickapp.com/"
},
"define": {
"PRODUCTION": true
}
},
"h5-5g.aigc-quickapp.com": {
"title": "H5-5g.aigc-quickapp.com",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "https://5g.aigc-quickapp.com/"
},
"define": {
"PRODUCTION": true
}
},
"h5-test.aigc-quickapp.com": {
"title": "H5-test.aigc-quickapp.com",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "https://test.aigc-quickapp.com/"
},
"define": {
"PRODUCTION": true
}
},
"http://localhost:8050/": {
"title": "H5-localhost:8050",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "http://localhost:8050/"
},
"define": {
"PRODUCTION": true
}
}
}
}
}
{
"scripts": {
"mp-weixin": "node scripts/mp-weixin.patch.js",
"i18n:check": "node scripts/i18n-check.js",
"test": "node scripts/test-gate.js",
"test:util": "node --test tests/util.test.js",
"prebuild": "npm run test",
"prestart": "npm run test"
},
"devDependencies": {
"dart-sass": "^1.25.0",
"terser-webpack-plugin": "^5.3.10",
"zion-uniapp-mp-load-package": "^1.0.13"
},
"dependencies": {
"jweixin-module": "^1.6.0"
},
"uni-app": {
"scripts": {
"weixin": {
"title": "微信小程序自定义发行",
"env": {
"UNI_PLATFORM": "mp-weixin"
},
"define": {
"MP_WEIXIN": true,
"PRODUCTION": true
}
},
"h5-xcx20.5g-quickapp.com": {
"title": "H5-xcx20.5g-quickapp.com",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "https://xcx20.5g-quickapp.com/"
},
"define": {
"PRODUCTION": true
}
},
"h5-xcx.aigc-quickapp.com": {
"title": "H5-xcx.aigc-quickapp.com",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "https://xcx.aigc-quickapp.com/"
},
"define": {
"PRODUCTION": true
}
},
"h5-5g.aigc-quickapp.com": {
"title": "H5-5g.aigc-quickapp.com",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "https://5g.aigc-quickapp.com/"
},
"define": {
"PRODUCTION": true
}
},
"h5-test.aigc-quickapp.com": {
"title": "H5-test.aigc-quickapp.com",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "https://test.aigc-quickapp.com/"
},
"define": {
"PRODUCTION": true
}
},
"http://localhost:8050/": {
"title": "H5-localhost:8050",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "http://localhost:8050/"
},
"define": {
"PRODUCTION": true
}
},
"http://192.168.8.118:8050/": {
"title": "H5-192.168.8.118:8050",
"env": {
"UNI_PLATFORM": "h5",
"UNI_APP_DOMAIN": "http://192.168.8.118:8050/"
},
"define": {
"PRODUCTION": true
}
}
}
}
}