更新1

common/lang/en.js

@@ -94,6 +94,8 @@ export default {
 		look:'look',
 		kaiqi:'on',
 		guanbi:'off',
+		refreshTime:'last refresh time',
+		volume:'volume',
 	},
 	equipmentStatics:{
 		title:'Machine Sales Ranking',
@@ -105,10 +107,65 @@ export default {
 	user:{
 		title:'me',
 		bindLogout:'exit',
-		equipmentname:'modify device name'
+		equipmentname:'modify device name',
+		remote:'remote operation'
 	},
 	equipmentname:{
 		title:'modify device name',
 		updata:'update',
+	},
+	remoteList:{
+		dosugur:'remote sugar making',
+		flowers:'shielding/display pattern',
+		parameters:'parameter adjustment',
+		alarmClock:'alarm clock(time switch furnace head/machine sleep)',
+		volume:'Machine volume adjustment'
+	},
+	dosugar:{
+		equipmentClientID:'Enter the machine code',
+		placeholder:'Enter the last 6 digits of the device code',
+		search:'search',
+		chooseEquipment:'choose equipment',
+		chooseProduct:'choose product',
+		list:'today sugar list'
+	},
+	flowers:{
+		flower:'flower',
+		show:'show',
+		unshow:'unshow',
+		submit:'submit'
+	},
+	volume:{
+		volu:'Current volume'
+	},
+	parameters:{
+		general:'General parameters',
+		advanced:'Advanced parameters',
+		debug:'Debug page'
+	},
+	alarmClock:{
+		title:'alarmClock',
+		chooseTime:'select time',
+		type:'type',
+		qi:'7',
+		yi:'1',
+		er:'2',
+		san:'3',
+		si:'4',
+		wu:'5',
+		liu:'6',
+		add:'add',
+		placeholder:'select machine or searching',
+		switchChange:'Whether to turn on the alarm clock',
+		name:'clock name',
+		update:'update',
+		delete:'delete',
+		kailutou:'open the furnace head',
+		guanlutou:'close the furnace head', 
+		kaixiumian:'start sleep', 
+		guanxiumian:'close sleep',
+		status1:'closed',
+		status2:'enable',
+		zhou:''
 	}
 }

common/lang/zh.js

@@ -92,6 +92,8 @@ export default {
 		look:'查看',
 		kaiqi:'开启',
 		guanbi:'关闭',
+		refreshTime:'最近刷新时间',
+		volume:'音量',
 	},
 	equipmentStatics:{
 		title:'机器销售排行',
@@ -103,10 +105,65 @@ export default {
 	user:{
 		title:'我的',
 		bindLogout:'退出',
-		equipmentname:'修改设备名称'
+		equipmentname:'修改设备名称',
+		remote:'远程操作'
 	},
 	equipmentname:{
 		title:'修改设备名称',
 		updata:'更改',
+	},
+	remoteList:{
+		dosugur:'远程做糖',
+		flowers:'屏蔽/显示售卖花型',
+		parameters:'参数调整',
+		alarmClock:'闹钟(定时开关炉头/机器休眠)',
+		volume:'机器音量调节'
+	},
+	dosugar:{
+		equipmentClientID:'输入机器编码',
+		placeholder:'输入设备编码后6位',
+		search:'搜索',
+		chooseEquipment:'点击选择机器',
+		chooseProduct:'点击选择商品',
+		list:'今日做糖列表'
+	},
+	flowers:{
+		flower:'花型',
+		show:'显示',
+		unshow:'屏蔽',
+		submit:'提交'
+	},
+	volume:{
+		volu:'当前音量'
+	},
+	parameters:{
+		general:'通用参数',
+		advanced:'进阶参数',
+		debug:'调试页参数'
+	},
+	alarmClock:{
+		title:'时钟',
+		chooseTime:'选择时间',
+		type:'闹钟类型',
+		qi:'日',
+		yi:'一',
+		er:'二',
+		san:'三',
+		si:'四',
+		wu:'五',
+		liu:'六',
+		add:'添加',
+		placeholder:'请选择机器或通过搜索添加',
+		switchChange:'是否开启闹钟',
+		name:'闹钟名称',
+		update:'修改',
+		delete:'删除',
+		kailutou:'开启炉头', 
+		guanlutou:'关闭炉头', 
+		kaixiumian:'开始休眠', 
+		guanxiumian:'结束休眠',
+		status1:'已关闭',
+		status2:'已启用',
+		zhou:'周'
 	}
 }

main.js

@@ -54,8 +54,8 @@ const i18n = new VueI18n({
 });
 
 App.mpType = 'app'
-Vue.prototype.serverurl="http://127.0.0.1:8090";
-// Vue.prototype.serverurl="https://app.sunzee.com.cn/ShenzeeServer";
+// Vue.prototype.serverurl="http://127.0.0.1:8090";
+Vue.prototype.serverurl="https://app.sunzee.com.cn/ShenzeeServer";
 Vue.prototype.$store = store;
 Vue.prototype._i18n = i18n;
 const app = new Vue({

packageA/pages/remote/advancedParameters.vue

@@ -4,14 +4,14 @@
 		</view> -->
 		<view class="search">
 			<view class="search-title">
-				输入机器编码
+				{{$t('dosugar.equipmentClientID')}}
 			</view>
 			<view class="search-input">
-				<input type="text" placeholder='输入设备编码后6位' v-model="searchClientId" />
+				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
 				<button type="primary" class="" @click="search()">
-					<p class="">搜索</P>
+					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
 		</view>
@@ -19,7 +19,7 @@
 			<view class="uni-list">
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-left">
-						点击选择机器
+						{{$t('dosugar.chooseEquipment')}}
 					</view>
 					<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
 						<picker @change="changeEquipment" :value="index" :range="equipmentNameList">

packageA/pages/remote/alarmClockItem.vue

@@ -1,25 +1,25 @@
 <template>
 	<view>
 		<view class="test">
-			<view>时钟</view>
+			<view>{{$t('alarmClock.title')}}</view>
 			<p class="time">{{time}}</p>
-			<button class="btime" type="primary" @click="onShowDatePicker('time')">选择时间</button>
+			<button class="btime" type="primary" @click="onShowDatePicker('time')">{{$t('alarmClock.chooseTime')}}</button>
 		</view>
 		<mx-date-picker :show="showPicker" :type="type" :value="value" :show-tips="true" :begin-text="'1'"
 			:end-text="'2'" :show-seconds="true" @confirm="onSelected" @cancel="onSelected" />
 		<view class="example-body">
-			<uni-badge class="uni-badge-left-margin" :inverted="Sunday" text="日" type="primary" @click="wek(7)" />
-			<uni-badge class="uni-badge-left-margin" :inverted="Monday" text="一" type="primary" @click="wek(1)" />
-			<uni-badge class="uni-badge-left-margin" :inverted="Tuesday" text="二" type="primary" @click="wek(2)" />
-			<uni-badge class="uni-badge-left-margin" :inverted="Wednesday" text="三" type="primary" @click="wek(3)" />
-			<uni-badge class="uni-badge-left-margin" :inverted="Thursday" text="四" type="primary" @click="wek(4)" />
-			<uni-badge class="uni-badge-left-margin" :inverted="Friday" text="五" type="primary" @click="wek(5)" />
-			<uni-badge class="uni-badge-left-margin" :inverted="Saturday" text="六" type="primary" @click="wek(6)" />
+			<uni-badge class="uni-badge-left-margin" :inverted="Sunday" :text="$t('alarmClock.qi')" type="primary" @click="wek(7)" />
+			<uni-badge class="uni-badge-left-margin" :inverted="Monday" :text="$t('alarmClock.yi')" type="primary" @click="wek(1)" />
+			<uni-badge class="uni-badge-left-margin" :inverted="Tuesday" :text="$t('alarmClock.er')" type="primary" @click="wek(2)" />
+			<uni-badge class="uni-badge-left-margin" :inverted="Wednesday" :text="$t('alarmClock.san')" type="primary" @click="wek(3)" />
+			<uni-badge class="uni-badge-left-margin" :inverted="Thursday" :text="$t('alarmClock.si')" type="primary" @click="wek(4)" />
+			<uni-badge class="uni-badge-left-margin" :inverted="Friday" :text="$t('alarmClock.wu')" type="primary" @click="wek(5)" />
+			<uni-badge class="uni-badge-left-margin" :inverted="Saturday" :text="$t('alarmClock.liu')" type="primary" @click="wek(6)" />
 		</view>
 		<view class="line"></view>
 		<view class="uni-list-cell">
 			<view class="uni-list-cell-left">
-				闹钟类型:
+				{{$t('alarmClock.type')}}:
 			</view>
 			<view class="uni-list-cell-db">
 				<picker @change="bindPickerChange" :value="indexType" :range="array">
@@ -30,31 +30,31 @@
 		<!-- //查找 -->
 		<view class="search">
 			<view class="search-title">
-				输入编码添加
+				{{$t('dosugar.equipmentClientID')}}
 			</view>
 			<view class="search-input">
-				<input type="text" placeholder='输入设备编码后6位' v-model="searchClientId" />
+				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
 				<button type="primary" class="" @click="search()">
-					<p class="">添加</P>
+					<p class="">{{$t('alarmClock.add')}}</P>
 				</button>
 			</view>
 		</view>
 		<!-- //多选下拉框 -->
 		<view class="select-item">
 			<ld-select :multiple="true" :list="equipmentNameList" label-key="label" value-key="value"
-				placeholder="请选择机器或通过搜索添加" clearable v-model="equipmentIds" @change="selectChange2"></ld-select>
+				:placeholder="$t('alarmClock.placeholder')" clearable v-model="equipmentIds" @change="selectChange2"></ld-select>
 		</view>
 		<view class="uni-list">
 			<view class="uni-list-cell uni-list-cell-pd">
-				<view class="uni-list-cell-db">是否开启闹钟</view>
+				<view class="uni-list-cell-db">{{$t('alarmClock.switchChange')}}</view>
 				<switch :checked="status" @change="switchChange" />
 			</view>
 		</view>
 		<view class="search">
 			<view class="search-title">
-				闹钟名称：
+				{{$t('alarmClock.name')}}：
 			</view>
 			<view class="search-input2">
 				<input type="text"  v-model="name" />
@@ -64,14 +64,14 @@
 		<!-- //提交按钮 -->
 		<view class="tr">
 			<button v-if="clock=='add'" type="primary" formType="submit" @click="add()" class="button">
-				<p class="p1">添加</p>
+				<p class="p1">{{$t('alarmClock.add')}}</p>
 			</button>
 			<button v-if="clock!='add'" v-show="ushow" type="primary" formType="submit" @click="update()"
 				class="button">
-				<p class="p1">修改</p>
+				<p class="p1">{{$t('alarmClock.update')}}</p>
 			</button>
 			<button v-if="clock!='add'" v-show="ushow" type="warn" formType="submit" @click="delet()" class="button">
-				<p class="p1">删除</p>
+				<p class="p1">{{$t('alarmClock.delete')}}</p>
 			</button>
 		</view>
 	</view>
@@ -103,7 +103,8 @@
 				type: 'rangetime',
 				value: '',
 				//0：炉头开启，1：炉头关闭，2：开始休眠，3：结束休眠
-				array: ['开启炉头', '关闭炉头', '开始休眠', '结束休眠'],
+				// array: ['开启炉头', '关闭炉头', '开始休眠', '结束休眠'],
+				array: [this.$t('alarmClock.kailutou'), this.$t('alarmClock.guanlutou'), this.$t('alarmClock.kaixiumian'), this.$t('alarmClock.guanxiumian')],
 				indexType: 0,
 				Sunday: true,
 				Monday: true,

packageA/pages/remote/alarmClockList.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="head">
 			<view class="left-top">
-				<p class="left-top-p">闹钟</p>
+				<p class="left-top-p">{{$t('alarmClock.title')}}</p>
 			</view>
 			<view class="right-top">
 				<p class="right-top-p" @click="addAlarmClockItem()">+</p>
@@ -83,10 +83,12 @@
 								var alarmClock = alarmClocks[i];
 								var status = alarmClock.status;
 								if (status == '0') {
-									alarmClock.status = "已关闭"
+									// 已关闭
+									alarmClock.status = this.$t('alarmClock.status1')
 								}
 								if (status == '1') {
-									alarmClock.status = "已启用"
+									// 已qiyong
+									alarmClock.status = this.$t('alarmClock.status2')
 								}
 								var week = alarmClock.week;
 								if (week != null || week != '') {
@@ -96,25 +98,25 @@
 										var t = w[j];
 										switch (t) {
 											case "1":
-												zhou = zhou + "周一,"
+												zhou = zhou + this.$t('alarmClock.zhou')+this.$t('alarmClock.yi')+","
 												break;
 											case "2":
-												zhou = zhou + "周二,"
+												zhou = zhou + this.$t('alarmClock.zhou')+this.$t('alarmClock.er')+","
 												break;
 											case "3":
-												zhou = zhou + "周三,"
+												zhou = zhou + this.$t('alarmClock.zhou')+this.$t('alarmClock.san')+","
 												break;
 											case "4":
-												zhou = zhou + "周四,"
+												zhou = zhou + this.$t('alarmClock.zhou')+this.$t('alarmClock.si')+","
 												break;
 											case "5":
-												zhou = zhou + "周五,"
+												zhou = zhou + this.$t('alarmClock.zhou')+this.$t('alarmClock.wu')+","
 												break;
 											case "6":
-												zhou = zhou + "周六,"
+												zhou = zhou + this.$t('alarmClock.zhou')+this.$t('alarmClock.liu')+","
 												break;
 											case "7":
-												zhou = zhou + "周日"
+												zhou = zhou + this.$t('alarmClock.zhou')+this.$t('alarmClock.qi')+","
 												break;
 											default:
 
@@ -124,16 +126,16 @@
 									var type = alarmClock.type;
 									switch (type) { //0：炉头开启，1：炉头关闭，2：开始休眠，3：结束休眠
 										case "0":
-											type = "炉头开启"
+											type = this.$t('alarmClock.kailutou')
 											break;
 										case "1":
-											type = "炉头关闭"
+											type = this.$t('alarmClock.guanlutou')
 											break;
 										case "2":
-											type = "开始休眠"
+											type = this.$t('alarmClock.kaixiumian')
 											break;
 										case "3":
-											type = "结束休眠"
+											type = this.$t('alarmClock.guanxiumian')
 											break;
 										default:
 

packageA/pages/remote/debugParameters.vue

@@ -0,0 +1,448 @@
+<template>
+	<view class="">
+		<!-- <view class="line">
+		</view> -->
+		<view class="search">
+			<view class="search-title">
+				{{$t('dosugar.equipmentClientID')}}
+			</view>
+			<view class="search-input">
+				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
+			</view>
+			<view class="search-button">
+				<button type="primary" class="" @click="search()">
+					<p class="">{{$t('dosugar.search')}}</P>
+				</button>
+			</view>
+		</view>
+		<view class="td-right">
+			<view class="uni-list">
+				<view class="uni-list-cell">
+					<view class="uni-list-cell-left">
+						{{$t('dosugar.chooseEquipment')}}
+					</view>
+					<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
+						<picker @change="changeEquipment" :value="index" :range="equipmentNameList">
+							<view class="uni-input">{{equipmentNameList[index]}}</view>
+						</picker>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-show="show">
+			<view class="body">
+				<p class="p">门1开</p>
+				<button type="primary" class="button" @click="update('M300','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M300','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<!-- //320特有 -->
+			<view class="" v-show="equimentType=='MG320'">
+				<view class="body">
+					<p class="p">门2开</p>
+					<button type="primary" class="button" @click="update('M301','0')">
+						<p class="p2">启动</P>
+					</button>
+					<button type="primary" class="button" @click="update('M301','1')">
+						<p class="p2">关闭</P>
+					</button>
+				</view>
+				<view class="line2"></view>
+			</view>
+			<view class="body">
+				<p class="p">下料白</p>
+				<button type="primary" class="button" @click="update('M302','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M302','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">下料红</p>
+				<button type="primary" class="button" @click="update('M303','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M303','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">下料黄</p>
+				<button type="primary" class="button" @click="update('M304','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M304','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">下料蓝</p>
+				<button type="primary" class="button" @click="update('M305','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M305','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">气泵启动</p>
+				<button type="primary" class="button" @click="update('M306','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M306','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">清洗</p>
+				<button type="primary" class="button" @click="update('M307','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M307','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">出棍推杆</p>
+				<button type="primary" class="button" @click="update('M308','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M308','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">柜内加湿</p>
+				<button type="primary" class="button" @click="update('M38','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M38','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">炉头加热并启动</p>
+				<button type="primary" class="button" @click="update('M39','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M39','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">炉头加热并启动</p>
+				<button type="primary" class="button" @click="update('M39','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M39','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">炉头转动高速</p>
+				<button type="primary" class="button" @click="update('M43','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M43','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">炉头转动中速</p>
+				<button type="primary" class="button" @click="update('M42','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M42','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">炉头转动低速</p>
+				<button type="primary" class="button" @click="update('M41','0')">
+					<p class="p2">启动</P>
+				</button>
+				<button type="primary" class="button" @click="update('M41','1')">
+					<p class="p2">关闭</P>
+				</button>
+			</view>
+			<view class="line2"></view>
+			<!-- //301和320都有 -->
+			<view class="" v-show="equimentType=='MG301'||equimentType=='MG320'">
+				<view class="body">
+					<p class="p">搅棍电机</p>
+					<button type="primary" class="button" @click="update('M307','0')">
+						<p class="p2">启动</P>
+					</button>
+					<button type="primary" class="button" @click="update('M307','1')">
+						<p class="p2">关闭</P>
+					</button>
+				</view>
+				<view class="line2"></view>
+				<view class="body">
+					<p class="p">柜内加热</p>
+					<button type="primary" class="button" @click="update('M37','0')">
+						<p class="p2">启动</P>
+					</button>
+					<button type="primary" class="button" @click="update('M37','1')">
+						<p class="p2">关闭</P>
+					</button>
+				</view>
+				<view class="line2"></view>
+				<view class="body">
+					<p class="p">线圈散热风机</p>
+					<button type="primary" class="button" @click="update('M313','0')">
+						<p class="p2">启动</P>
+					</button>
+					<button type="primary" class="button" @click="update('M313','1')">
+						<p class="p2">关闭</P>
+					</button>
+				</view>
+				<view class="line2"></view>
+				<view class="body">
+					<p class="p">排气风机</p>
+					<button type="primary" class="button" @click="update('M310','0')">
+						<p class="p2">启动</P>
+					</button>
+					<button type="primary" class="button" @click="update('M310','1')">
+						<p class="p2">关闭</P>
+					</button>
+				</view>
+				<view class="line2"></view>
+			</view>
+			<!-- //320特有 -->
+			<view class="" v-show="equimentType=='MG320'">
+				<view class="body">
+					<p class="p">糖完排湿</p>
+					<button type="primary" class="button" @click="update('M314','0')">
+						<p class="p2">启动</P>
+					</button>
+					<button type="primary" class="button" @click="update('M314','1')">
+						<p class="p2">关闭</P>
+					</button>
+				</view>
+				<view class="line2"></view>
+				<view class="body">
+					<p class="p">清尾丝</p>
+					<button type="primary" class="button" @click="update('M318','0')">
+						<p class="p2">启动</P>
+					</button>
+					<button type="primary" class="button" @click="update('M318','1')">
+						<p class="p2">关闭</P>
+					</button>
+				</view>
+				<view class="line2"></view>
+			</view>
+		</view>
+		<view class="line2"></view>
+	</view>
+</template>
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex'
+	export default {
+		data() {
+			return {
+				index: null,
+				equipmentName: null,
+				equimentType: null,
+				equipmentId:null,
+				equipmentNameList: [],
+				globalUser: null,
+				show: false,
+				searchClientId:null
+			}
+		},
+		onShow() {
+			var token = uni.getStorageSync("token");
+			this.globalUser = uni.getStorageSync("globalUser");
+			if (token.length > 1) {
+				this.getEquipmentListData();
+				// this.getParam();
+			} else {
+				uni.reLaunch({
+					url: '../Login/Login',
+				});
+			}
+
+		},
+		methods: {
+			...mapActions('chart', ['getParameters', 'updateParameters', 'getEquipmentListByUser']),
+			getEquipmentListData() {
+				this.getEquipmentListByUser(this.globalUser)
+					.then(data => {
+						// this.merchantList = data;
+						var listName = data[0].equipmentList;
+						var equipmentNameList = [];
+						for (var i = 0; i < listName.length; i++) {
+							equipmentNameList.push("名称:" + listName[i].name + " 编号:" + listName[i].clientId.substring(
+								listName[i].clientId.length - 6, listName[i].clientId.length));
+						}
+						this.equipmentNameList = equipmentNameList;
+						var listId = data[0].id;
+						if (listId != null && listId != '1') {
+							uni.setStorageSync("listName", listName);
+						}
+						uni.stopPullDownRefresh();
+					}, _ => void uni.stopPullDownRefresh());
+			},
+			search(){
+				var clientId = this.searchClientId;
+				var list = uni.getStorageSync("listName");
+				// console.log(clientId);
+				var n = 0;
+				for (var i = 0; i < list.length; i++) {
+					var code = list[i].clientId.substring(list[i].clientId.length - 6, list[i].clientId.length);
+					if(code==clientId){
+						n++;
+						this.index = i;
+						var id = list[i].id;
+						this.equipmentId =  id;
+						this.equimentType = list[i].equimentType;
+						this.clientId = list[i].clientId;
+						this.show = true;
+						// if (this.equimentType == 'MG280') {
+						// 	this.show = false;
+						// }
+						// this.getParam();
+						break;
+					}
+				}
+				if(n==0){
+					uni.showModal({
+						title: "提示",
+						content: "找不到该机器",
+						success: (res) => {
+					
+						}
+					})
+				}
+			},
+			//改变机器
+			changeEquipment: function(e) {
+				this.searchClientId = null;
+				this.index = e.target.value;
+				var list = uni.getStorageSync("listName");
+				this.equipmentId = list[e.target.value].id;
+				this.equimentType = list[e.target.value].equimentType;
+				this.clientId = list[e.target.value].clientId;
+				this.show = true;
+				// if (this.equimentType == 'MG280') {
+				// 	this.show = false;
+				// }
+			},
+
+			update(name, val) {
+				const param = {};
+				param['id'] = this.equipmentId;
+				param['name'] = name;
+				param['val'] = val;
+				this.updateParameters(param).then(res => {
+					if (res.data == 'SUCCESS') {
+						uni.showToast({
+							title: '发送成功',
+							duration: 1000
+						});
+					}
+				}, _ => void uni.stopPullDownRefresh());
+			},
+		},
+	}
+</script>
+
+<style>
+	.search{
+		width: 100%;
+		padding-top: 10upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+	.search-title{
+		width: 28%;
+		text-align: center;
+		font-size: 26upx;
+		font-family: "PingFang-SC-Bold";
+	}
+	.search-input{
+		width: 45%;
+		text-align: center;
+		font-size: 26upx;
+		font-family: "PingFang-SC-Bold";
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+	.search-button{
+		width: 20%;
+		padding-left: 7upx;
+		text-align: center;
+	}
+	.line {
+		height: 50upx;
+	}
+
+	.line2 {
+		height: 10upx;
+	}
+
+	.body {
+		background-color: #FFFFFF;
+		width: 700upx;
+		padding: 10upx 10upx 10upx 10upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		font-size: 32upx;
+	}
+
+	.p {
+		width: 350upx;
+		text-align: right;
+	}
+
+	.input {
+		width: 200upx;
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+		text-align: center;
+	}
+
+	.button {
+		width: 120upx;
+		height: 60upx;
+		text-align: left;
+		border-radius: 10upx;
+
+	}
+
+	.p2 {
+		font-size: 30upx;
+		/* #ifndef H5 */
+		padding-top: 3upx;
+		/* #endif */
+		position: absolute;
+		/* 水平居中 */
+		left: 50%;
+		-webkit-transform: translateX(-50%);
+		transform: translateX(-50%);
+	}
+</style>

packageA/pages/remote/dosugar.vue

@@ -2,14 +2,14 @@
 	<view>
 		<view class="search">
 			<view class="search-title">
-				输入机器编码
+				{{$t('dosugar.equipmentClientID')}}
 			</view>
 			<view class="search-input">
-				<input type="text" placeholder='输入设备编码后6位' v-model="searchClientId" />
+				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
 				<button type="primary" class="" @click="search()">
-					<p class="">搜索</P>
+					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
 		</view>
@@ -17,7 +17,7 @@
 			<view class="uni-list">
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-left">
-						点击选择机器
+						{{$t('dosugar.chooseEquipment')}}
 					</view>
 					<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
 						<picker @change="changeEquipment" :value="index" :range="equipmentNameList">
@@ -27,7 +27,7 @@
 				</view>
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-left">
-						点击选择商品
+						{{$t('dosugar.chooseProduct')}}
 					</view>
 					<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
 						<picker @change="changeProduct" :value="index2" :range="productList">
@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<view class="p">
-			<p style="text-align:right" @click=sugarList()>今日做糖列表>>></p>
+			<p style="text-align:right" @click=sugarList()>{{$t('dosugar.list')}}>>></p>
 		</view>
 		<view class="tr">
 			<button type="primary" formType="submit" @click="dosugar()" class="button">

packageA/pages/remote/flowerShow.vue

@@ -2,14 +2,14 @@
 	<view>
 		<view class="search">
 			<view class="search-title">
-				输入机器编码
+				{{$t('dosugar.equipmentClientID')}}
 			</view>
 			<view class="search-input">
-				<input type="text" placeholder='输入设备编码后6位' v-model="searchClientId" />
+				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
 				<button type="primary" class="" @click="search()">
-					<p class="">搜索</P>
+					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
 		</view>
@@ -17,7 +17,7 @@
 			<view class="uni-list">
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-left">
-						点击选择机器
+						{{$t('dosugar.chooseEquipment')}}
 					</view>
 					<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
 						<picker @change="changeEquipment" :value="index" :range="equipmentNameList">
@@ -28,19 +28,19 @@
 			</view>
 		</view>
 		<view class="product" v-for="(item,index) in products" :key="index">
-			<P class="productName">花型：{{item.productName}} </P>
+			<P class="productName">{{$t('flowers.flower')}}：{{item.productName}} </P>
 				<radio-group :name="item.productName">
 					<label>
-						<radio @click="changeShow(item.productName+'-0')" value="0" :checked='item.showType==null || item.showType==0' /><text>显示</text>
+						<radio @click="changeShow(item.productName+'-0')" value="0" :checked='item.showType==null || item.showType==0' /><text>{{$t('flowers.show')}}</text>
 					</label>
 					<label>
-						<radio @click="changeShow(item.productName+'-1')" value="1" :checked='item.showType==1' /><text>屏蔽</text>
+						<radio @click="changeShow(item.productName+'-1')" value="1" :checked='item.showType==1' /><text>{{$t('flowers.unshow')}}</text>
 					</label>
 				</radio-group>
 		</view>
 		<view class="tr">
 			<button type="primary" formType="submit" @click="updateProducts()" class="button">
-				<p class="p1">提交</p>
+				<p class="p1">{{$t('flowers.submit')}}</p>
 			</button>
 		</view>
 	</view>

packageA/pages/remote/generalParameters.vue

@@ -5,14 +5,14 @@
 		
 		<view class="search">
 			<view class="search-title">
-				输入机器编码
+				{{$t('dosugar.equipmentClientID')}}
 			</view>
 			<view class="search-input">
-				<input type="text" placeholder='输入设备编码后6位' v-model="searchClientId" />
+				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
 				<button type="primary" class="" @click="search()">
-					<p class="">搜索</P>
+					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
 		</view>
@@ -20,7 +20,7 @@
 			<view class="uni-list">
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-left">
-						点击选择机器
+						{{$t('dosugar.chooseEquipment')}}
 					</view>
 					<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
 						<picker @change="changeEquipment" :value="index" :range="equipmentNameList">

packageA/pages/remote/parameters.vue

@@ -3,6 +3,7 @@
 		<uni-list>
 			<uni-list-item title="通用参数"  @click="general()"></uni-list-item>
 			<uni-list-item title="进阶参数"  @click="advanced()"></uni-list-item>
+			<uni-list-item title="调试页参数"  @click="debug()"></uni-list-item>
 		</uni-list>
 	</view>
 </template>
@@ -20,6 +21,11 @@
 					url: 'advancedParameters',
 				});
 			},
+			debug(){
+				uni.navigateTo({
+					url: 'debugParameters',
+				});
+			},
 			
 		}
 	}

packageA/pages/remote/remoteList.vue

@@ -4,19 +4,19 @@
 			<uni-collapse :accordion="true">
 				<uni-list>
 					<view v-show="show">
-						<uni-list-item title="远程做糖" @click="sugar()" />
+						<uni-list-item :title="$t('remoteList.dosugur')" @click="sugar()" />
 					</view>
 					<view v-show="show">
-						<uni-list-item title="屏蔽/显示售卖花型" @click="flowers()" />
+						<uni-list-item :title="$t('remoteList.flowers')" @click="flowers()" />
 					</view>
 					<view v-show="show2">
-						<uni-list-item title="参数调整" @click="parameters()" />
+						<uni-list-item :title="$t('remoteList.parameters')" @click="parameters()" />
 					</view>
 					<view v-show="show">
-						<uni-list-item title="闹钟(定时开关炉头/机器休眠)" @click="alarmClock()" />
+						<uni-list-item :title="$t('remoteList.alarmClock')" @click="alarmClock()" />
 					</view>
 					<view v-show="show">
-						<uni-list-item title="机器音量调节" @click="volume()" />
+						<uni-list-item :title="$t('remoteList.volume')" @click="volume()" />
 					</view>
 				</uni-list>
 			</uni-collapse>
@@ -32,6 +32,9 @@
 		mapActions,
 		mapMutations
 	} from 'vuex'
+	import {
+		dateUtils
+	} from '@/common/util.js';
 	export default {
 		data() {
 			return {

packageA/pages/remote/volume.vue

@@ -2,14 +2,14 @@
 	<view>
 		<view class="search">
 			<view class="search-title">
-				输入机器编码
+				{{$t('dosugar.equipmentClientID')}}
 			</view>
 			<view class="search-input">
-				<input type="text" placeholder='输入设备编码后6位' v-model="searchClientId" />
+				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
 				<button type="primary" class="" @click="search()">
-					<p class="">搜索</P>
+					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
 		</view>
@@ -17,7 +17,7 @@
 			<view class="uni-list">
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-left">
-						点击选择机器
+						{{$t('dosugar.chooseEquipment')}}
 					</view>
 					<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
 						<picker @change="changeEquipment" :value="index" :range="equipmentNameList">
@@ -27,13 +27,13 @@
 				</view>
 			</view>
 		</view>
-		<view class="uni-title">当前音量</view>
+		<view class="uni-title">{{$t('volume.volu')}}</view>
 		<view>
 			<slider :value="volume" @change="sliderChange" min="0" max="15" show-value />
 		</view>
 		<view class="tr">
 			<button type="primary" formType="submit" @click="update()" class="button">
-				<p class="p1">提交</p>
+				<p class="p1">{{$t('flowers.submit')}}</p>
 			</button>
 		</view>
 	</view>

packageA/pages/user/modify/joinpayMchCheck.vue

@@ -28,12 +28,16 @@
 				<view class="body user-insert-line">旧杉德宝账号：{{oldJoinpayMchCheck.bankAccountNo}}</view>
 				<view class="body user-insert-line">旧杉德宝账户名：{{oldJoinpayMchCheck.bankAccountName}}</view>
 				<view class="body user-insert-line">旧杉德宝类型：{{oldJoinpayMchCheck.bankAccountType==0?'企业':'个人'}}</view>
+				<view class="body user-insert-line">旧联行号：{{oldJoinpayMchCheck.bankChannelNo}}</view>
+				<view class="body user-insert-line">旧开户行：{{oldJoinpayMchCheck.bankChannelName}}</view>
 			</form>
 			<view class="body user-insert">-------------------------------</view>
 			<form >
 				<view class="body user-insert-line">新杉德宝账号：{{joinpayMchCheck.bankAccountNo}}</view>
 				<view class="body user-insert-line">新杉德宝账户名：{{joinpayMchCheck.bankAccountName}}</view>
 				<view class="body user-insert-line">新杉德宝类型：{{joinpayMchCheck.bankAccountType==0?'企业':'个人'}}</view>
+				<view class="body user-insert-line">联行号：{{joinpayMchCheck.bankChannelNo}}</view>
+				<view class="body user-insert-line">开户行：{{joinpayMchCheck.bankChannelName}}</view>
 				<view class="body user-insert-line">提交时间：{{joinpayMchCheck.createDate}}</view>
 				<view class="btn-area">
 					<button type="primary" @click="agreeShande(joinpayMchCheck.id)" style="margin-right: 20px;" >通过</button>

packageA/pages/user/orderEit.vue

@@ -137,6 +137,7 @@
 					url: this.serverurl + '/TJoinpayMch/getMch',
 					data: {
 						"adminId": globalUser.id,
+						"bizCode":this.order.id
 					},
 					header: {
 						'token': token

pages.json

@@ -281,18 +281,54 @@
 					"enablePullDownRefresh": false
 				}
 			},{
-				"path": "pages/user/modify/retailModify",
+				"path": "pages/user/modify/proportionCheck",
 				"style": {
 					"navigationBarTitleText": "分销修改",
 					"enablePullDownRefresh": false
 				}
 			},{
-				"path": "pages/user/modify/collectionModify",
+				"path": "pages/user/modify/joinpayMchCheck",
 				"style": {
 					"navigationBarTitleText": "收款信息修改",
 					"enablePullDownRefresh": false
 				}
 			}
-		]
+		    ,{
+                    "path" : "pages/user/modify/proportionCheckList",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "分销修改列表",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+                ,{
+                    "path" : "pages/user/modify/joinpayMchCheckList",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "收款信息修改列表",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+                ,{
+                    "path" : "pages/remote/flowerShow",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "售卖花型控制",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+                ,{
+                    "path" : "pages/remote/debugParameters",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "调试页",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 	}]
 }

pages/User/equipmentStatusList.vue

@@ -172,8 +172,8 @@
 						<view><span>{{$t('equipmentStatusList.temperature')}}：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
 						<view><span>{{$t('equipmentStatusList.humidity')}}：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
 						<view><span>{{$t('equipmentStatusList.equipmentTemperature')}}：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
-						<view><span>最近刷新时间：</span><span>{{equipment.lastUpdateTime}}</span></view>
-						<view><span>音量：</span><span>{{equipment.volume?equipment.volume:''}}</span></view>
+						<view><span>{{$t('equipmentStatusList.refreshTime')}}:</span><span>{{equipment.lastUpdateTime}}</span></view>
+						<view><span>{{$t('equipmentStatusList.volume')}}:</span><span>{{equipment.volume?equipment.volume:''}}</span></view>
 						<view class="" v-if="equipment.hasTodayAlarm">
 							<view><span>{{$t('equipmentStatusList.alarm')}}：</span></view>
 							<view v-for="(alarm,index) in equipment.alarmList" :key="index">

pages/User/user.vue

@@ -27,8 +27,8 @@
 					</view>
 				</view> -->
 				<view v-if="showRemote">
-					<!-- <view v-if=""> -->
-					<uni-list-item title="远程操作" @click="remote()" />
+					<!-- <view v-if=""> 远程操作-->
+					<uni-list-item :title="$t('user.remote')" @click="remote()" />
 					<!-- </view> -->
 				</view>
 				<view v-if="show">