diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/packageB/pay/pay.js b/packageB/pay/pay.js new file mode 100644 index 0000000..4d0642b --- /dev/null +++ b/packageB/pay/pay.js @@ -0,0 +1,25 @@ +// packageB/pay/pay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: { + unit: '北京燃气公司', + number: '123456', + address: '北京市海淀区**********601', + available: '60.00', + owe: '0.00', + payValue: '', + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + +}) \ No newline at end of file diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/packageB/pay/pay.js b/packageB/pay/pay.js new file mode 100644 index 0000000..4d0642b --- /dev/null +++ b/packageB/pay/pay.js @@ -0,0 +1,25 @@ +// packageB/pay/pay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: { + unit: '北京燃气公司', + number: '123456', + address: '北京市海淀区**********601', + available: '60.00', + owe: '0.00', + payValue: '', + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + +}) \ No newline at end of file diff --git a/packageB/pay/pay.json b/packageB/pay/pay.json new file mode 100644 index 0000000..fd81d36 --- /dev/null +++ b/packageB/pay/pay.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "燃气缴费", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/packageB/pay/pay.js b/packageB/pay/pay.js new file mode 100644 index 0000000..4d0642b --- /dev/null +++ b/packageB/pay/pay.js @@ -0,0 +1,25 @@ +// packageB/pay/pay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: { + unit: '北京燃气公司', + number: '123456', + address: '北京市海淀区**********601', + available: '60.00', + owe: '0.00', + payValue: '', + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + +}) \ No newline at end of file diff --git a/packageB/pay/pay.json b/packageB/pay/pay.json new file mode 100644 index 0000000..fd81d36 --- /dev/null +++ b/packageB/pay/pay.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "燃气缴费", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/pay/pay.wxml b/packageB/pay/pay.wxml new file mode 100644 index 0000000..ec7b99b --- /dev/null +++ b/packageB/pay/pay.wxml @@ -0,0 +1,39 @@ + + + 缴费单位 + {{form.unit}} + + + + 用户编号 + {{form.number}} + + + + 住址信息 + {{form.address}} + + + + 可用余额 + ￥{{form.available}} + + + + 欠费余额 + ￥{{form.owe}} + + + + 充值金额 + + + + 立即缴费 + + 缴费记录 + \ No newline at end of file diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/packageB/pay/pay.js b/packageB/pay/pay.js new file mode 100644 index 0000000..4d0642b --- /dev/null +++ b/packageB/pay/pay.js @@ -0,0 +1,25 @@ +// packageB/pay/pay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: { + unit: '北京燃气公司', + number: '123456', + address: '北京市海淀区**********601', + available: '60.00', + owe: '0.00', + payValue: '', + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + +}) \ No newline at end of file diff --git a/packageB/pay/pay.json b/packageB/pay/pay.json new file mode 100644 index 0000000..fd81d36 --- /dev/null +++ b/packageB/pay/pay.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "燃气缴费", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/pay/pay.wxml b/packageB/pay/pay.wxml new file mode 100644 index 0000000..ec7b99b --- /dev/null +++ b/packageB/pay/pay.wxml @@ -0,0 +1,39 @@ + + + 缴费单位 + {{form.unit}} + + + + 用户编号 + {{form.number}} + + + + 住址信息 + {{form.address}} + + + + 可用余额 + ￥{{form.available}} + + + + 欠费余额 + ￥{{form.owe}} + + + + 充值金额 + + + + 立即缴费 + + 缴费记录 + \ No newline at end of file diff --git a/packageB/pay/pay.wxss b/packageB/pay/pay.wxss new file mode 100644 index 0000000..853981a --- /dev/null +++ b/packageB/pay/pay.wxss @@ -0,0 +1,40 @@ +page { + background: linear-gradient(180deg, #fefeff 0%, #a8cee1 50%, #fefeff 100%); +} +.pay { + padding: 32rpx; +} +.content { + font-size: 34rpx; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-bottom: 32rpx; +} +.title { + font-weight: 600; + margin-right: 40rpx; +} +.button { + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + margin-top: 160rpx; +} +.button-area { + width: fit-content; + padding: 16rpx 80rpx; + color: #fff; + font-weight: 600; + background-color: rgba(36, 131, 179, 1); + border-radius: 16rpx; +} + +.history { + display: flex; + justify-content: flex-end; + margin-top: 100rpx; + color: #3394fe; +} \ No newline at end of file diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/packageB/pay/pay.js b/packageB/pay/pay.js new file mode 100644 index 0000000..4d0642b --- /dev/null +++ b/packageB/pay/pay.js @@ -0,0 +1,25 @@ +// packageB/pay/pay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: { + unit: '北京燃气公司', + number: '123456', + address: '北京市海淀区**********601', + available: '60.00', + owe: '0.00', + payValue: '', + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + +}) \ No newline at end of file diff --git a/packageB/pay/pay.json b/packageB/pay/pay.json new file mode 100644 index 0000000..fd81d36 --- /dev/null +++ b/packageB/pay/pay.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "燃气缴费", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/pay/pay.wxml b/packageB/pay/pay.wxml new file mode 100644 index 0000000..ec7b99b --- /dev/null +++ b/packageB/pay/pay.wxml @@ -0,0 +1,39 @@ + + + 缴费单位 + {{form.unit}} + + + + 用户编号 + {{form.number}} + + + + 住址信息 + {{form.address}} + + + + 可用余额 + ￥{{form.available}} + + + + 欠费余额 + ￥{{form.owe}} + + + + 充值金额 + + + + 立即缴费 + + 缴费记录 + \ No newline at end of file diff --git a/packageB/pay/pay.wxss b/packageB/pay/pay.wxss new file mode 100644 index 0000000..853981a --- /dev/null +++ b/packageB/pay/pay.wxss @@ -0,0 +1,40 @@ +page { + background: linear-gradient(180deg, #fefeff 0%, #a8cee1 50%, #fefeff 100%); +} +.pay { + padding: 32rpx; +} +.content { + font-size: 34rpx; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-bottom: 32rpx; +} +.title { + font-weight: 600; + margin-right: 40rpx; +} +.button { + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + margin-top: 160rpx; +} +.button-area { + width: fit-content; + padding: 16rpx 80rpx; + color: #fff; + font-weight: 600; + background-color: rgba(36, 131, 179, 1); + border-radius: 16rpx; +} + +.history { + display: flex; + justify-content: flex-end; + margin-top: 100rpx; + color: #3394fe; +} \ No newline at end of file diff --git a/packageB/userManagement/userManagement.js b/packageB/userManagement/userManagement.js new file mode 100644 index 0000000..d7131ea --- /dev/null +++ b/packageB/userManagement/userManagement.js @@ -0,0 +1,24 @@ +Page({ + data: { + list: [ + { + id: '1', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + ] + }, +}) \ No newline at end of file diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/packageB/pay/pay.js b/packageB/pay/pay.js new file mode 100644 index 0000000..4d0642b --- /dev/null +++ b/packageB/pay/pay.js @@ -0,0 +1,25 @@ +// packageB/pay/pay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: { + unit: '北京燃气公司', + number: '123456', + address: '北京市海淀区**********601', + available: '60.00', + owe: '0.00', + payValue: '', + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + +}) \ No newline at end of file diff --git a/packageB/pay/pay.json b/packageB/pay/pay.json new file mode 100644 index 0000000..fd81d36 --- /dev/null +++ b/packageB/pay/pay.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "燃气缴费", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/pay/pay.wxml b/packageB/pay/pay.wxml new file mode 100644 index 0000000..ec7b99b --- /dev/null +++ b/packageB/pay/pay.wxml @@ -0,0 +1,39 @@ + + + 缴费单位 + {{form.unit}} + + + + 用户编号 + {{form.number}} + + + + 住址信息 + {{form.address}} + + + + 可用余额 + ￥{{form.available}} + + + + 欠费余额 + ￥{{form.owe}} + + + + 充值金额 + + + + 立即缴费 + + 缴费记录 + \ No newline at end of file diff --git a/packageB/pay/pay.wxss b/packageB/pay/pay.wxss new file mode 100644 index 0000000..853981a --- /dev/null +++ b/packageB/pay/pay.wxss @@ -0,0 +1,40 @@ +page { + background: linear-gradient(180deg, #fefeff 0%, #a8cee1 50%, #fefeff 100%); +} +.pay { + padding: 32rpx; +} +.content { + font-size: 34rpx; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-bottom: 32rpx; +} +.title { + font-weight: 600; + margin-right: 40rpx; +} +.button { + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + margin-top: 160rpx; +} +.button-area { + width: fit-content; + padding: 16rpx 80rpx; + color: #fff; + font-weight: 600; + background-color: rgba(36, 131, 179, 1); + border-radius: 16rpx; +} + +.history { + display: flex; + justify-content: flex-end; + margin-top: 100rpx; + color: #3394fe; +} \ No newline at end of file diff --git a/packageB/userManagement/userManagement.js b/packageB/userManagement/userManagement.js new file mode 100644 index 0000000..d7131ea --- /dev/null +++ b/packageB/userManagement/userManagement.js @@ -0,0 +1,24 @@ +Page({ + data: { + list: [ + { + id: '1', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + ] + }, +}) \ No newline at end of file diff --git a/packageB/userManagement/userManagement.json b/packageB/userManagement/userManagement.json new file mode 100644 index 0000000..bf8a1aa --- /dev/null +++ b/packageB/userManagement/userManagement.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "户号管理", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/packageB/pay/pay.js b/packageB/pay/pay.js new file mode 100644 index 0000000..4d0642b --- /dev/null +++ b/packageB/pay/pay.js @@ -0,0 +1,25 @@ +// packageB/pay/pay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: { + unit: '北京燃气公司', + number: '123456', + address: '北京市海淀区**********601', + available: '60.00', + owe: '0.00', + payValue: '', + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + +}) \ No newline at end of file diff --git a/packageB/pay/pay.json b/packageB/pay/pay.json new file mode 100644 index 0000000..fd81d36 --- /dev/null +++ b/packageB/pay/pay.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "燃气缴费", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/pay/pay.wxml b/packageB/pay/pay.wxml new file mode 100644 index 0000000..ec7b99b --- /dev/null +++ b/packageB/pay/pay.wxml @@ -0,0 +1,39 @@ + + + 缴费单位 + {{form.unit}} + + + + 用户编号 + {{form.number}} + + + + 住址信息 + {{form.address}} + + + + 可用余额 + ￥{{form.available}} + + + + 欠费余额 + ￥{{form.owe}} + + + + 充值金额 + + + + 立即缴费 + + 缴费记录 + \ No newline at end of file diff --git a/packageB/pay/pay.wxss b/packageB/pay/pay.wxss new file mode 100644 index 0000000..853981a --- /dev/null +++ b/packageB/pay/pay.wxss @@ -0,0 +1,40 @@ +page { + background: linear-gradient(180deg, #fefeff 0%, #a8cee1 50%, #fefeff 100%); +} +.pay { + padding: 32rpx; +} +.content { + font-size: 34rpx; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-bottom: 32rpx; +} +.title { + font-weight: 600; + margin-right: 40rpx; +} +.button { + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + margin-top: 160rpx; +} +.button-area { + width: fit-content; + padding: 16rpx 80rpx; + color: #fff; + font-weight: 600; + background-color: rgba(36, 131, 179, 1); + border-radius: 16rpx; +} + +.history { + display: flex; + justify-content: flex-end; + margin-top: 100rpx; + color: #3394fe; +} \ No newline at end of file diff --git a/packageB/userManagement/userManagement.js b/packageB/userManagement/userManagement.js new file mode 100644 index 0000000..d7131ea --- /dev/null +++ b/packageB/userManagement/userManagement.js @@ -0,0 +1,24 @@ +Page({ + data: { + list: [ + { + id: '1', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + ] + }, +}) \ No newline at end of file diff --git a/packageB/userManagement/userManagement.json b/packageB/userManagement/userManagement.json new file mode 100644 index 0000000..bf8a1aa --- /dev/null +++ b/packageB/userManagement/userManagement.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "户号管理", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/userManagement/userManagement.wxml b/packageB/userManagement/userManagement.wxml new file mode 100644 index 0000000..235691c --- /dev/null +++ b/packageB/userManagement/userManagement.wxml @@ -0,0 +1,21 @@ + + + + 新增户号 + + + + {{item.name}} + 更多操作 + + + 用户编号： + {{item.uerNumber}} + + + 地址： + {{item.address}} + + + + diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/packageB/pay/pay.js b/packageB/pay/pay.js new file mode 100644 index 0000000..4d0642b --- /dev/null +++ b/packageB/pay/pay.js @@ -0,0 +1,25 @@ +// packageB/pay/pay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: { + unit: '北京燃气公司', + number: '123456', + address: '北京市海淀区**********601', + available: '60.00', + owe: '0.00', + payValue: '', + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + +}) \ No newline at end of file diff --git a/packageB/pay/pay.json b/packageB/pay/pay.json new file mode 100644 index 0000000..fd81d36 --- /dev/null +++ b/packageB/pay/pay.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "燃气缴费", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/pay/pay.wxml b/packageB/pay/pay.wxml new file mode 100644 index 0000000..ec7b99b --- /dev/null +++ b/packageB/pay/pay.wxml @@ -0,0 +1,39 @@ + + + 缴费单位 + {{form.unit}} + + + + 用户编号 + {{form.number}} + + + + 住址信息 + {{form.address}} + + + + 可用余额 + ￥{{form.available}} + + + + 欠费余额 + ￥{{form.owe}} + + + + 充值金额 + + + + 立即缴费 + + 缴费记录 + \ No newline at end of file diff --git a/packageB/pay/pay.wxss b/packageB/pay/pay.wxss new file mode 100644 index 0000000..853981a --- /dev/null +++ b/packageB/pay/pay.wxss @@ -0,0 +1,40 @@ +page { + background: linear-gradient(180deg, #fefeff 0%, #a8cee1 50%, #fefeff 100%); +} +.pay { + padding: 32rpx; +} +.content { + font-size: 34rpx; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-bottom: 32rpx; +} +.title { + font-weight: 600; + margin-right: 40rpx; +} +.button { + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + margin-top: 160rpx; +} +.button-area { + width: fit-content; + padding: 16rpx 80rpx; + color: #fff; + font-weight: 600; + background-color: rgba(36, 131, 179, 1); + border-radius: 16rpx; +} + +.history { + display: flex; + justify-content: flex-end; + margin-top: 100rpx; + color: #3394fe; +} \ No newline at end of file diff --git a/packageB/userManagement/userManagement.js b/packageB/userManagement/userManagement.js new file mode 100644 index 0000000..d7131ea --- /dev/null +++ b/packageB/userManagement/userManagement.js @@ -0,0 +1,24 @@ +Page({ + data: { + list: [ + { + id: '1', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + ] + }, +}) \ No newline at end of file diff --git a/packageB/userManagement/userManagement.json b/packageB/userManagement/userManagement.json new file mode 100644 index 0000000..bf8a1aa --- /dev/null +++ b/packageB/userManagement/userManagement.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "户号管理", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/userManagement/userManagement.wxml b/packageB/userManagement/userManagement.wxml new file mode 100644 index 0000000..235691c --- /dev/null +++ b/packageB/userManagement/userManagement.wxml @@ -0,0 +1,21 @@ + + + + 新增户号 + + + + {{item.name}} + 更多操作 + + + 用户编号： + {{item.uerNumber}} + + + 地址： + {{item.address}} + + + + diff --git a/packageB/userManagement/userManagement.wxss b/packageB/userManagement/userManagement.wxss new file mode 100644 index 0000000..5efb1b7 --- /dev/null +++ b/packageB/userManagement/userManagement.wxss @@ -0,0 +1,55 @@ +page { + background: linear-gradient(180deg, #fefeff 0%, #a8cee1 50%, #fefeff 100%); +} +.user-management { + padding: 20rpx; +} +.add { + width: 100%; + display: flex; + justify-content: flex-end; +} +.button-area { + padding: 10rpx 16rpx; + background-color: rgba(36, 131, 179, .2); + border-radius: 16rpx; + font-size: 28rpx; + height: 36rpx; + white-space: nowrap; + margin-left: 16rpx; +} +.default-button { + width: fit-content; + padding: 10rpx 20rpx; + color: #fff; + font-weight: 600; + background-color: rgba(36, 131, 179, 1); + border-radius: 16rpx; +} +.content { + padding: 30rpx 20rpx; + margin-top: 36rpx; + border-radius: 16rpx; + box-shadow: 0px 0px 3px #999; + background-color: #fff; +} +.content:active { + background-color: rgba(36, 131, 179, .2); +} +.name { + display: flex; + justify-content: space-between; + font-size: 38rpx; +} +.name-text { + font-weight: 600; +} +.user-number { + display: flex; + flex-direction: row; + font-size: 34rpx; + margin: 16rpx 0; +} +.address { + font-size: 34rpx; +} \ No newline at end of file diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/packageB/pay/pay.js b/packageB/pay/pay.js new file mode 100644 index 0000000..4d0642b --- /dev/null +++ b/packageB/pay/pay.js @@ -0,0 +1,25 @@ +// packageB/pay/pay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: { + unit: '北京燃气公司', + number: '123456', + address: '北京市海淀区**********601', + available: '60.00', + owe: '0.00', + payValue: '', + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + +}) \ No newline at end of file diff --git a/packageB/pay/pay.json b/packageB/pay/pay.json new file mode 100644 index 0000000..fd81d36 --- /dev/null +++ b/packageB/pay/pay.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "燃气缴费", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/pay/pay.wxml b/packageB/pay/pay.wxml new file mode 100644 index 0000000..ec7b99b --- /dev/null +++ b/packageB/pay/pay.wxml @@ -0,0 +1,39 @@ + + + 缴费单位 + {{form.unit}} + + + + 用户编号 + {{form.number}} + + + + 住址信息 + {{form.address}} + + + + 可用余额 + ￥{{form.available}} + + + + 欠费余额 + ￥{{form.owe}} + + + + 充值金额 + + + + 立即缴费 + + 缴费记录 + \ No newline at end of file diff --git a/packageB/pay/pay.wxss b/packageB/pay/pay.wxss new file mode 100644 index 0000000..853981a --- /dev/null +++ b/packageB/pay/pay.wxss @@ -0,0 +1,40 @@ +page { + background: linear-gradient(180deg, #fefeff 0%, #a8cee1 50%, #fefeff 100%); +} +.pay { + padding: 32rpx; +} +.content { + font-size: 34rpx; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-bottom: 32rpx; +} +.title { + font-weight: 600; + margin-right: 40rpx; +} +.button { + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + margin-top: 160rpx; +} +.button-area { + width: fit-content; + padding: 16rpx 80rpx; + color: #fff; + font-weight: 600; + background-color: rgba(36, 131, 179, 1); + border-radius: 16rpx; +} + +.history { + display: flex; + justify-content: flex-end; + margin-top: 100rpx; + color: #3394fe; +} \ No newline at end of file diff --git a/packageB/userManagement/userManagement.js b/packageB/userManagement/userManagement.js new file mode 100644 index 0000000..d7131ea --- /dev/null +++ b/packageB/userManagement/userManagement.js @@ -0,0 +1,24 @@ +Page({ + data: { + list: [ + { + id: '1', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + ] + }, +}) \ No newline at end of file diff --git a/packageB/userManagement/userManagement.json b/packageB/userManagement/userManagement.json new file mode 100644 index 0000000..bf8a1aa --- /dev/null +++ b/packageB/userManagement/userManagement.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "户号管理", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/userManagement/userManagement.wxml b/packageB/userManagement/userManagement.wxml new file mode 100644 index 0000000..235691c --- /dev/null +++ b/packageB/userManagement/userManagement.wxml @@ -0,0 +1,21 @@ + + + + 新增户号 + + + + {{item.name}} + 更多操作 + + + 用户编号： + {{item.uerNumber}} + + + 地址： + {{item.address}} + + + + diff --git a/packageB/userManagement/userManagement.wxss b/packageB/userManagement/userManagement.wxss new file mode 100644 index 0000000..5efb1b7 --- /dev/null +++ b/packageB/userManagement/userManagement.wxss @@ -0,0 +1,55 @@ +page { + background: linear-gradient(180deg, #fefeff 0%, #a8cee1 50%, #fefeff 100%); +} +.user-management { + padding: 20rpx; +} +.add { + width: 100%; + display: flex; + justify-content: flex-end; +} +.button-area { + padding: 10rpx 16rpx; + background-color: rgba(36, 131, 179, .2); + border-radius: 16rpx; + font-size: 28rpx; + height: 36rpx; + white-space: nowrap; + margin-left: 16rpx; +} +.default-button { + width: fit-content; + padding: 10rpx 20rpx; + color: #fff; + font-weight: 600; + background-color: rgba(36, 131, 179, 1); + border-radius: 16rpx; +} +.content { + padding: 30rpx 20rpx; + margin-top: 36rpx; + border-radius: 16rpx; + box-shadow: 0px 0px 3px #999; + background-color: #fff; +} +.content:active { + background-color: rgba(36, 131, 179, .2); +} +.name { + display: flex; + justify-content: space-between; + font-size: 38rpx; +} +.name-text { + font-weight: 600; +} +.user-number { + display: flex; + flex-direction: row; + font-size: 34rpx; + margin: 16rpx 0; +} +.address { + font-size: 34rpx; +} \ No newline at end of file diff --git a/pages/guide/index.js b/pages/guide/index.js index b3791bd..bbd0135 100644 --- a/pages/guide/index.js +++ b/pages/guide/index.js @@ -9,15 +9,6 @@ Page({ data: { isLogin: false, - list: [{ - name: '基础业务功能', - url: '/packageA/base_function/index' - }, - { - name: '点击获取设备列表', - url: '/packageA/home_center/device_list/index' - }, - ], background: [ 'https://unpkg.com/@vant/assets/apple-1.jpeg', 'https://unpkg.com/@vant/assets/apple-2.jpeg', @@ -26,7 +17,7 @@ gridList: [ { id: 'manage', - name: '帐号管理' + name: '户号管理' }, { id: 'pay', @@ -69,34 +60,6 @@ }); let access_token = await wx.getStorageSync('access_token'); if(!access_token) return; - // try { - // await request({ - // data: { - // action: 'device.virtualAdd', - // params: { - // product_id: 'qkxb0pmel0q1g9yf', - // token: 'release_common_component' - // } - // } - // }).then(async (res) => { - // const { - // device_id - // } = res; - // if (!device_id) return; - // this.setData({ - // isLogin: true - // }); - // wx.setStorageSync('vir_device', device_id); - // }); - // } catch (error) { - // // wx.showModal({ - // // title: '检测到未部署SDK', - // // content: '后续功能操作都需要SDK能力, 请去涂鸦开发平台程序一键部署SDK' - // // }) - // this.setData({ - // isLogin: false - // }); - // } }, onShow: async function () { @@ -141,22 +104,22 @@ return false; }, 1800); }, - gotoOtherage: function (event) { - const { - dataset: { - url - } - } = event.currentTarget; - if (url == 'navigateToMiniProgram') { - this.setData({ - show: true - }); - } else { - wx.navigateTo({ - url - }); - } - }, + // gotoOtherage: function (event) { + // const { + // dataset: { + // url + // } + // } = event.currentTarget; + // if (url == 'navigateToMiniProgram') { + // this.setData({ + // show: true + // }); + // } else { + // wx.navigateTo({ + // url + // }); + // } + // }, //拨打电话 call(event) { let phone = '010-96777'; @@ -171,4 +134,17 @@ phoneNumber: phone }) }, + //跳转页面 + gotoUserManage(event) { + const { dataset: { gopage } } = event.currentTarget; + if(gopage === 'manage') { + wx.navigateTo({ + url: '/packageB/userManagement/userManagement', + }) + } else if(gopage === 'pay') { + wx.navigateTo({ + url: '/packageB/pay/pay', + }) + } + } }); \ No newline at end of file diff --git a/app.json b/app.json index 5625e9c..263b1ba 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,15 @@ "provider": "wxd2aa51ffacc3ff86" } } + }, + { + "root": "packageB", + "name": "packageB", + "independent": true, + "pages": [ + "userManagement/userManagement", + "pay/pay" + ] } ], "window": { diff --git a/app.wxss b/app.wxss index 97362b8..6eff5aa 100644 --- a/app.wxss +++ b/app.wxss @@ -5,5 +5,4 @@ flex-direction: column; justify-content: flex-start; overflow: scroll; -} - +} \ No newline at end of file diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index cc9b4a3..28208e2 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -19,7 +19,10 @@ off: '关', low: '低', high: '高', - strong: '强' + strong: '强', + power_on: '通电', + power_off: '断电', + last: '恢复最近一次的状态', } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.wxss b/packageA/home_center/common_panel/components/Enum/index.wxss index 4811aee..9d64841 100644 --- a/packageA/home_center/common_panel/components/Enum/index.wxss +++ b/packageA/home_center/common_panel/components/Enum/index.wxss @@ -27,8 +27,9 @@ .enum-item { display: inline-block; margin-right: 11px; - width: 102px; - height: 33px; + min-width: 102px; + height: 33px; + padding: 0 20rpx; text-align: center; font-family: PingFangSC-Regular; font-size: 12px; diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 4c54314..2bb6692 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -115,7 +115,7 @@ }; } }); - } + } return { roDpList, rwDpList } }, diff --git a/packageB/pay/pay.js b/packageB/pay/pay.js new file mode 100644 index 0000000..4d0642b --- /dev/null +++ b/packageB/pay/pay.js @@ -0,0 +1,25 @@ +// packageB/pay/pay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: { + unit: '北京燃气公司', + number: '123456', + address: '北京市海淀区**********601', + available: '60.00', + owe: '0.00', + payValue: '', + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + +}) \ No newline at end of file diff --git a/packageB/pay/pay.json b/packageB/pay/pay.json new file mode 100644 index 0000000..fd81d36 --- /dev/null +++ b/packageB/pay/pay.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "燃气缴费", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/pay/pay.wxml b/packageB/pay/pay.wxml new file mode 100644 index 0000000..ec7b99b --- /dev/null +++ b/packageB/pay/pay.wxml @@ -0,0 +1,39 @@ + + + 缴费单位 + {{form.unit}} + + + + 用户编号 + {{form.number}} + + + + 住址信息 + {{form.address}} + + + + 可用余额 + ￥{{form.available}} + + + + 欠费余额 + ￥{{form.owe}} + + + + 充值金额 + + + + 立即缴费 + + 缴费记录 + \ No newline at end of file diff --git a/packageB/pay/pay.wxss b/packageB/pay/pay.wxss new file mode 100644 index 0000000..853981a --- /dev/null +++ b/packageB/pay/pay.wxss @@ -0,0 +1,40 @@ +page { + background: linear-gradient(180deg, #fefeff 0%, #a8cee1 50%, #fefeff 100%); +} +.pay { + padding: 32rpx; +} +.content { + font-size: 34rpx; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-bottom: 32rpx; +} +.title { + font-weight: 600; + margin-right: 40rpx; +} +.button { + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + margin-top: 160rpx; +} +.button-area { + width: fit-content; + padding: 16rpx 80rpx; + color: #fff; + font-weight: 600; + background-color: rgba(36, 131, 179, 1); + border-radius: 16rpx; +} + +.history { + display: flex; + justify-content: flex-end; + margin-top: 100rpx; + color: #3394fe; +} \ No newline at end of file diff --git a/packageB/userManagement/userManagement.js b/packageB/userManagement/userManagement.js new file mode 100644 index 0000000..d7131ea --- /dev/null +++ b/packageB/userManagement/userManagement.js @@ -0,0 +1,24 @@ +Page({ + data: { + list: [ + { + id: '1', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + { + id: '2', + name: '张三', + uerNumber: '123456', + address: '北京市海淀区ajsbkajbcabckad' + }, + ] + }, +}) \ No newline at end of file diff --git a/packageB/userManagement/userManagement.json b/packageB/userManagement/userManagement.json new file mode 100644 index 0000000..bf8a1aa --- /dev/null +++ b/packageB/userManagement/userManagement.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "户号管理", + "navigationBarBackgroundColor": "#f8f8f8" +} \ No newline at end of file diff --git a/packageB/userManagement/userManagement.wxml b/packageB/userManagement/userManagement.wxml new file mode 100644 index 0000000..235691c --- /dev/null +++ b/packageB/userManagement/userManagement.wxml @@ -0,0 +1,21 @@ + + + + 新增户号 + + + + {{item.name}} + 更多操作 + + + 用户编号： + {{item.uerNumber}} + + + 地址： + {{item.address}} + + + + diff --git a/packageB/userManagement/userManagement.wxss b/packageB/userManagement/userManagement.wxss new file mode 100644 index 0000000..5efb1b7 --- /dev/null +++ b/packageB/userManagement/userManagement.wxss @@ -0,0 +1,55 @@ +page { + background: linear-gradient(180deg, #fefeff 0%, #a8cee1 50%, #fefeff 100%); +} +.user-management { + padding: 20rpx; +} +.add { + width: 100%; + display: flex; + justify-content: flex-end; +} +.button-area { + padding: 10rpx 16rpx; + background-color: rgba(36, 131, 179, .2); + border-radius: 16rpx; + font-size: 28rpx; + height: 36rpx; + white-space: nowrap; + margin-left: 16rpx; +} +.default-button { + width: fit-content; + padding: 10rpx 20rpx; + color: #fff; + font-weight: 600; + background-color: rgba(36, 131, 179, 1); + border-radius: 16rpx; +} +.content { + padding: 30rpx 20rpx; + margin-top: 36rpx; + border-radius: 16rpx; + box-shadow: 0px 0px 3px #999; + background-color: #fff; +} +.content:active { + background-color: rgba(36, 131, 179, .2); +} +.name { + display: flex; + justify-content: space-between; + font-size: 38rpx; +} +.name-text { + font-weight: 600; +} +.user-number { + display: flex; + flex-direction: row; + font-size: 34rpx; + margin: 16rpx 0; +} +.address { + font-size: 34rpx; +} \ No newline at end of file diff --git a/pages/guide/index.js b/pages/guide/index.js index b3791bd..bbd0135 100644 --- a/pages/guide/index.js +++ b/pages/guide/index.js @@ -9,15 +9,6 @@ Page({ data: { isLogin: false, - list: [{ - name: '基础业务功能', - url: '/packageA/base_function/index' - }, - { - name: '点击获取设备列表', - url: '/packageA/home_center/device_list/index' - }, - ], background: [ 'https://unpkg.com/@vant/assets/apple-1.jpeg', 'https://unpkg.com/@vant/assets/apple-2.jpeg', @@ -26,7 +17,7 @@ gridList: [ { id: 'manage', - name: '帐号管理' + name: '户号管理' }, { id: 'pay', @@ -69,34 +60,6 @@ }); let access_token = await wx.getStorageSync('access_token'); if(!access_token) return; - // try { - // await request({ - // data: { - // action: 'device.virtualAdd', - // params: { - // product_id: 'qkxb0pmel0q1g9yf', - // token: 'release_common_component' - // } - // } - // }).then(async (res) => { - // const { - // device_id - // } = res; - // if (!device_id) return; - // this.setData({ - // isLogin: true - // }); - // wx.setStorageSync('vir_device', device_id); - // }); - // } catch (error) { - // // wx.showModal({ - // // title: '检测到未部署SDK', - // // content: '后续功能操作都需要SDK能力, 请去涂鸦开发平台程序一键部署SDK' - // // }) - // this.setData({ - // isLogin: false - // }); - // } }, onShow: async function () { @@ -141,22 +104,22 @@ return false; }, 1800); }, - gotoOtherage: function (event) { - const { - dataset: { - url - } - } = event.currentTarget; - if (url == 'navigateToMiniProgram') { - this.setData({ - show: true - }); - } else { - wx.navigateTo({ - url - }); - } - }, + // gotoOtherage: function (event) { + // const { + // dataset: { + // url + // } + // } = event.currentTarget; + // if (url == 'navigateToMiniProgram') { + // this.setData({ + // show: true + // }); + // } else { + // wx.navigateTo({ + // url + // }); + // } + // }, //拨打电话 call(event) { let phone = '010-96777'; @@ -171,4 +134,17 @@ phoneNumber: phone }) }, + //跳转页面 + gotoUserManage(event) { + const { dataset: { gopage } } = event.currentTarget; + if(gopage === 'manage') { + wx.navigateTo({ + url: '/packageB/userManagement/userManagement', + }) + } else if(gopage === 'pay') { + wx.navigateTo({ + url: '/packageB/pay/pay', + }) + } + } }); \ No newline at end of file diff --git a/pages/guide/index.wxml b/pages/guide/index.wxml index 4c18565..4e4e997 100644 --- a/pages/guide/index.wxml +++ b/pages/guide/index.wxml @@ -15,7 +15,10 @@ icon-class="icon-class-one" content-class="grid-item-content" wx:for="{{gridList}}" - text="{{item.name}}"> + text="{{item.name}}" + data-gopage="{{item.id}}" + bindtap="gotoUserManage" + >