添加设备修改

src/projects/pension/apis/Common/device.js

@@ -20,3 +20,12 @@ export function setDefaultWatch(deviceNo) {
 		method: 'post',
 	})
 }
+
+//增加新设备
+export function addWatch(params) {
+	return request({
+		url: '/mobile/watchApi/addWatch',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/pension/views/Common/Device/Add.vue

@@ -1,30 +1,24 @@
 <template>
 	<div>
-		<header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">关联新设备</h1>
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-		</header>
-		<div class="mui-content">
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
 
+		<div class="mui-content">
 			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
 				<form class="mui-input-group">
 					<div class="mui-input-row">
 						<label>设备号</label>
-						<input type="text" class="mui-input-clear" placeholder="请输入唯一设备号" style="width:50%">
+						<input v-model="subForm.deviceNo" type="text" class="mui-input-clear" placeholder="请输入唯一设备号" style="width:50%">
 						<span class="mui-badge vongi-badge-pink">扫码</span>
 					</div>
-					<div class="mui-input-row">
-						<label>密码</label>
-						<input type="text" class="mui-input-clear" placeholder="初始密码888888">
-					</div>
 					<div class="mui-input-row">
 						<label>昵称</label>
-						<input type="text" class="mui-input-clear" placeholder="您对设备使用者的称呼">
+						<input v-model="subForm.aliasName" type="text" class="mui-input-clear" placeholder="您对设备使用者的称呼">
 					</div>
 				</form>
 			</div>
 			<div class="vongi-btn vongi-login-btn">
-				<button class="mui-btn mui-btn-pink">
+				<button class="mui-btn mui-btn-pink" @click="save">
 					保 存
 				</button>
 			</div>
@@ -33,6 +27,83 @@
 </template>
 
 <script>
+	import * as API_Device from '@/apis/Common/device'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import NavMenu from '@/components/NavMenu.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import * as WxJsApi from '$project/utils/wxJsApi'
+	export default {
+		name: 'CommonDeviceAdd',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+			NavMenu
+		},
+		data() {
+			return {
+				isLoading: false,
+
+				subForm: {
+					deviceNo: '',
+					aliasName: ''
+				},
+
+				pageTitle: '关联新设备',
+			}
+		},
+		created() {},
+		methods: {
+			//切换默认手环
+			save() {
+				this.isLoading = true;
+				API_Device.addWatch(this.subForm).then(response => {
+					this.isLoading = false;
+
+					mui.toast('添加成功');
+					this.$router.push({
+						name: 'CommonDeviceList'
+					})
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//微信扫二维码
+			scanCode() {
+				WxJsApi.scanQRCode(1).then(res => {
+					this.subForm.deviceNo = res.resultStr;
+				}).catch(error => {
+					mui.toast(error);
+				})
+			},
+
+			asynCallBack() {},
+		},
+		mounted() {
+			//获取微信配置
+			WxJsApi.getWxConfig();
+		},
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+				menu_list: 'menu_list',
+				common_menu_list: 'common_menu_list',
+				persion_home_model: 'persion_home_model'
+			})
+		}
+	}
 </script>
 
 <style scoped src="$project/assets/css/pension.css"></style>

src/projects/pension/views/Common/Device/List.vue

@@ -19,9 +19,9 @@
 				</li>
 			</ul>
 		</div>
-		<!-- <div class="fyy-footer">
-			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-pink ">关联新设备</button></div>
-		</div> -->
+		<div class="fyy-footer">
+			<div class="bindfyy-btn" @click="addDevice"><button type="submit" class="mui-btn mui-btn-pink ">关联新设备</button></div>
+		</div>
 	</div>
 </template>
 
@@ -81,6 +81,12 @@
 					mui.toast(error);
 				})
 			},
+			//关联新设备
+			addDevice() {
+				this.$router.push({
+					name: 'CommonDeviceAdd'
+				})
+			},
 
 			asynCallBack() {},
 		},

src/utils/wxJsApi.js

@@ -4,7 +4,7 @@ import * as API_Common from '$project/apis/common'
 
 //获取微信配置
 export function getWxConfig(jsApiList) {
-	var jsApiList = jsApiList || ['chooseImage', 'getLocalImgData','scanQRCode'];
+	var jsApiList = jsApiList || ['chooseImage', 'getLocalImgData', 'scanQRCode'];
 	let promise = (jsApiList => {
 		new Promise((resolve, reject) => {
 			console.log(jsApiList);
@@ -92,19 +92,21 @@ export function getLocation() {
 }
 
 //扫描二维码
-export function scanQRCode() {
+export function scanQRCode(needResult) {
+	var needResult = needResult || 1;
 	let promise = new Promise((resolve, reject) => {
 		wx.scanQRCode({
-			needResult: 1,
-			scanType: ["qrCode"], 
-			success: function (res) {
- 				var url = res.resultStr;
+			needResult: needResult,
+			scanType: ["qrCode"],
+			success: function(res) {
+				var url = res.resultStr;
 				reject(url);
-			},faile: function(res) {
+			},
+			faile: function(res) {
 				reject(res);
 			},
 			complete() {}
 		})
 	});
 	return promise;
-}
+}