diff --git a/page_moban/addsheshi.vue b/page_moban/addsheshi.vue
new file mode 100644
index 0000000..81fa981
--- /dev/null
+++ b/page_moban/addsheshi.vue
@@ -0,0 +1,345 @@
+
+
+
+
+
+
+
+ 设施名称
+
+
+ 一号桌
+
+
+
+
+ 设施类型
+
+
+ 茶室
+
+
+
+
+ 设施绑定
+
+
+ 22155221
+
+
+
+
+ 收费方式
+
+
+ 套餐1
+
+
+
+
+
+ 套餐时长
+
+
+ 套餐价格(元)
+
+
+
+
+ 3小时
+
+
+ 99.9
+
+
+
+
+ 注：订单提前结束剩余消费时长、金额不返还
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/page_moban/datingxq.vue b/page_moban/datingxq.vue
new file mode 100644
index 0000000..cf681ab
--- /dev/null
+++ b/page_moban/datingxq.vue
@@ -0,0 +1,477 @@
+
+
+
+
+
+
+
+
+ 名称
+
+
+
+
+
+
+
+ 类型
+
+
+ {{leixing}}
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
+
+
+ 设施列表
+
+
+ 添加
+
+
+
+
+
+
+ 2号桌
+
+
+ SN：2234681537
+
+
+
+
+ 已关闭
+
+
+
+
+
+
+
+
+
+ 2号桌
+
+
+
+
+
+ 未绑定
+
+
+
+
+
+
+
+
+
+
+
+ ×
+
+
+ 请选择添加设施方式
+
+
+
+
+
+ 扫码添加
+
+
+ 扫描设备上的二维码
+
+
+ 添加设施
+
+
+
+
+
+
+
+
+
+ 新建添加
+
+
+ 直接添加设施并生成设施二维码
+
+
+ 添加设施
+
+
+
+
+
+
+
+
+
+
+
+ 全关
+
+
+ 全开
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/page_moban/shoufei.vue b/page_moban/shoufei.vue
new file mode 100644
index 0000000..71a5039
--- /dev/null
+++ b/page_moban/shoufei.vue
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+ 收费方式1 (套餐收费)
+
+
+
+
+
+ 套餐时长
+
+
+ 套餐价格(元)
+
+
+
+
+ 3小时
+
+
+ 99.9
+
+
+
+
+ 注：订单提前结束剩余消费时长、金额不返还
+
+
+
+
+
+
+
+ 收费方式2 (单价收费)
+
+
+
+ 5元/小时，最低消费2小时，押金金额100元
+
+
+ (订单结束30分钟内退还)注：订单提前结束剩余消费时 长、金额不返还
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/page_shanghu/addtoom.vue b/page_shanghu/addtoom.vue
index 9c0f5e3..9a9c978 100644
--- a/page_shanghu/addtoom.vue
+++ b/page_shanghu/addtoom.vue
@@ -3,33 +3,140 @@
-
-
-
- 名称
-
-
-
-
-
-
-
- 类型
+
+
+
+
+ 名称
+
+
+
+
+
+
+
+ 类型
+
+
+ {{leixing}}
+
+
+
+
+ 是否开启保洁功能
+
+
+
+
+
+
+
+
+ 标签设置
+
+
+
+ {{ item.dictLabel }}
+
+
+
+
+
+ 房间照片
+
+
+
+
+
+
+
+
+ 价格设置
+
+
+
+
+ 收费方式
+
+
+ 套餐1
+
+
+
+
+
+ 套餐时长
+
+
+ 套餐价格(元)
+
+
+
+
+ 3小时
+
+
+ 99.9
+
+
+
+
+ 注：订单提前结束剩余消费时长、金额不返还
-
- {{leixing}}
-
-
-
-
-
-
- 取消
-
-
- 确认新建
-
-
+
+
+
+
+
+
+
+
+ 取消
+
+
+ 确认新建
+
+
+
@@ -42,6 +149,7 @@
},
leixing:'请选择类型',
show:false,
+ checked:false,
list:[
{
value: '2',
@@ -57,13 +165,89 @@
},
],
type:'',
+ biaoqianlist:[],
+ selectedIndices:[],
+ token:'',
+ url:'',
+ imgurl:''
}
},
onLoad() {
-
+
+ },
+ onShow() {
+ this.getbiaoqian()
+ this.getQiniuToken()
},
methods: {
+ // 点击选择收费
+ btnshoufei(){
+ uni.navigateTo({
+ url:'/page_moban/shoufei'
+ })
+ },
+ // 点击选择标签
+ btnbq(dictValue,index) {
+ const indexExists = this.selectedIndices.includes(index);
+ if (indexExists) {
+ this.selectedIndices = this.selectedIndices.filter(i => i !== index);
+ } else {
+ this.selectedIndices.push(index);
+ }
+ },
+ isSelected(index) {
+ return this.selectedIndices.includes(index);
+ },
+ // 获取标签
+ getbiaoqian(){
+ this.$u.get(`/appVerify/getDictData?dictType=ss_room_tags`).then((res) => {
+ if (res.code == 200) {
+ this.biaoqianlist = res.data
+ }
+ })
+ },
+ // 点击上传图片
+ getImage() {
+ uni.chooseImage({
+ count: 1,
+ success: (rst) => {
+ this.url = rst.tempFilePaths[0]
+ console.log(this.url);
+ }
+ })
+ },
+ onok(ev) {
+ this.url = ""
+ this.path = ev.path
+ let _this = this
+ let math = 'static/' + _this.$u.guid(20)
+ wx.uploadFile({
+ url: 'https://up-z2.qiniup.com',
+ name: 'file',
+ filePath: _this.path,
+ formData: {
+ token: _this.token, //后端返回的token
+ key: 'smartmeter/img/' + math
+ },
+ success: function(res) {
+ let str = JSON.parse(res.data)
+ _this.imgurl = 'https://lxnapi.ccttiot.com/' + str.key
+ }
+ })
+ },
+ oncancel() {
+ // url设置为空，隐藏控件
+ this.url = "";
+ },
+ // 获取上传七牛云token
+ getQiniuToken() {
+ this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+ if (res.code == 200) {
+ this.token = res.token
+ }
+ })
+ },
// 确认选择类型
confirm(e){
this.type = e[0].value
@@ -83,9 +267,99 @@
\ No newline at end of file
diff --git a/page_shanghu/weishebei.vue b/page_shanghu/weishebei.vue
new file mode 100644
index 0000000..6a1dfc6
--- /dev/null
+++ b/page_shanghu/weishebei.vue
@@ -0,0 +1,294 @@
+
+
+
+
+
+
+
+ SN:{{item.sn}}
+
+ 在线
+
+
+ 离线
+
+
+
+
+
+
+ 门店名称：{{item.storeName == null ? '--' : item.storeName}}
+
+
+ 投放位置：--
+
+
+ 设备状态：已投放
+ 待投放
+
+
+
+
+
+
+ 设备码
+
+
+
+
+ 没有更多设备啦...
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index f823d2a..bda94a3 100644
--- a/pages.json
+++ b/pages.json
@@ -307,6 +307,46 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
+ },{
+ "path": "weishebei",
+ "style": {
+ "navigationBarTitleText": "上传",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },{
+ "path": "toufsb",
+ "style": {
+ "navigationBarTitleText": "上传",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ }
+ ]
+ }, {
+ "root": "page_moban",
+ "pages": [
+ {
+ "path": "shoufei",
+ "style": {
+ "navigationBarTitleText": "上传",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },{
+ "path": "datingxq",
+ "style": {
+ "navigationBarTitleText": "上传",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },{
+ "path": "addsheshi",
+ "style": {
+ "navigationBarTitleText": "上传",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
}
]
}, {