maguodong/uniapp-ZHSQ
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: maguodong:cc1d99ad1c93b017515a024a4a33e4ceee273254
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb
...
compare: maguodong:2866332d274de0962c009ad99bf2bb4d971c861f
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb

7 Commits
cc1d99ad1c ... 2866332d27

Author SHA1 Message Date
赵毅
2866332d27 Merge branch 'master' of https://git.hshuishang.com/qiaojiale/uniapp-ZHSQ into feature/yi 2025-07-21 10:40:56 +08:00
black
2419b031d3 Merge branch 'feature/yi' 2025-07-18 18:48:39 +08:00
black
cb4c93dee2 Merge branch 'qjl' 2025-07-18 18:48:31 +08:00
black
dbc5c14348 移除提交订单页面的支付按钮点击事件 
- 删除了提交订单页面中立即支付按钮的点击事件处理函数
- 保留了微信支付请求的相关代码
- 移除了工作台首页的多余模板标签
 2025-07-18 18:46:49 +08:00
black
9dffbedf94 Merge branch 'feature/yi' 
# Conflicts:
#	unpackage/dist/dev/mp-weixin/project.private.config.json
 2025-07-18 17:02:28 +08:00
black
0a71636436 Merge branch 'qjl' 
# Conflicts:
#	unpackage/dist/dev/mp-weixin/project.private.config.json
 2025-07-18 17:00:02 +08:00
black
d803aeff4c Merge branch 'feature/yi' 
# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/kitchen/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/reservation/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
#	unpackage/dist/dev/mp-weixin/project.private.config.json
 2025-07-18 16:36:30 +08:00
2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
packages/shop/submitOrder/index.vue
View File

@ -62,7 +62,7 @@
<div class="footer"> <div class="footer">
<div class="btn" @click="craeteOrder">立即支付￥{{ totalMony }}</div> <div class="btn">立即支付￥{{ totalMony }}</div>
</div> </div>
</view> </view>
@ -173,7 +173,7 @@ export default {
uni.requestPayment({ uni.requestPayment({
"provider": "wxpay", "provider": "wxpay",
"orderInfo": { "orderInfo": {
"appid": "wxb4018c78fa143450", // "appid": "wxb4018c78fa143450", //
"noncestr": resCopy.nonceStr, // 随机字符串 "noncestr": resCopy.nonceStr, // 随机字符串
"package": resCopy.package, // 固定值 "package": resCopy.package, // 固定值
"prepayid":resCopy.prepayId, "prepayid":resCopy.prepayId,

2
packages/workOrderDashboard/index/index.vue
View File

@ -82,7 +82,7 @@
</div> </div>
</view> </view>
</template> </template>
<script> <script>
import { request, NavgateTo, menuButtonInfo } from '../../../utils'; import { request, NavgateTo, menuButtonInfo } from '../../../utils';