连接标签机

hdPad/src/pages.json

@@ -4,7 +4,8 @@
 		{"path": "pages/home/work","style": {"navigationBarTitleText": "工单"}},
 		{"path": "pages/home/modify","style": {"navigationBarTitleText": "修改"}},
 		{"path": "pages/home/make","style": {"navigationBarTitleText": "制作"}},
-		{"path": "pages/home/selectMake","style": {"navigationBarTitleText": "选款"}}
+		{"path": "pages/home/selectMake","style": {"navigationBarTitleText": "选款"}},
+		{"path": "pages/home/blue","style": {"navigationBarTitleText": "连接标签机"}}
 	],
 	"subPackages": [],
 	"globalStyle": {

hdPad/src/pages/home/blue.vue

@@ -13,7 +13,7 @@
 			<button @click="writeTSC" >tsc指令打印</button> -->
 			<!-- <button @click="state" >标签机状态</button> -->
 			<button @click="dis" >断开</button>
-			<text>{{tip}}</text>
+			<text style="font-size:10upx;">{{tip}}</text>
 		</view>
 	</view>
 </view>
@@ -401,5 +401,11 @@ export default {
 		margin: 10px;
 		margin-top:30px;
 	}
-	button{ margin-bottom: 25px;}
+	button{ 
+		margin-bottom: 25px;
+		background-color: #3385ff;
+		color:white;
+		height:35upx;
+		line-height: 35upx;
+	}
 </style>

hdPad/src/pages/home/components/createWork.vue

@@ -31,7 +31,7 @@
           </view>
 
           <view class="item" v-if="form.complete == 1">
-              <text class="left">打印</text>
+              <text class="left">完成后打印</text>
               <switch :checked="form.needPrint == 1 ? true : false" @change="changePrint" style="transform: scale(0.9,0.8)" />
           </view>
 
@@ -204,7 +204,8 @@ export default {
                 margin-left:3upx;
             }
             .selected{
-                background-color:#CCCCCC;
+                background-color:#3385ff;
+                border:1upx solid #3385ff;
                 color:white;
             } 
         }
@@ -227,8 +228,9 @@ export default {
                 align-items:center;
             }
             .selected{
-                background-color:#CCCCCC;
+                background-color:#3385ff;
                 color:white;
+                border:1upx solid #3385ff;
             }
         }
     }
@@ -238,6 +240,9 @@ export default {
         justify-content:center;
         button{
             width:80upx;
+            background-color: #fff;
+            border:1upx solid #999999;
+            color:#999999;
         }
         button:nth-child(2){
             border:1upx solid blue;

hdPad/src/pages/home/components/rightGoods.vue

@@ -194,7 +194,7 @@ export default {
             border:1upx solid #CCCCCC;
             width:30upx;
             height:25upx;
-            border-radius:10upx;
+            border-radius:13upx;
             display:flex;
             justify-content:center;
             align-items: center;
@@ -202,7 +202,8 @@ export default {
             color:#666666;
         }
         & .selected{
-            background-color:#CCCCCC;
+            background-color:#428369;
+            border:1upx solid #428369;
             color:white;
         }
     }

hdPad/src/pages/home/components/workInfo.vue

@@ -110,6 +110,10 @@
         <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认完成？" @confirm="confirmFinish"></uni-popup-dialog>
     </uni-popup>
 
+    <uni-popup ref="bluetoothRef" type="dialog">
+        <uni-popup-dialog type="info" cancelText="取消" confirmText="好的" title="提示" content="您还没有连接蓝牙，请先链接" @confirm="confirmGetBlue"></uni-popup-dialog>
+    </uni-popup>
+
   </view>
 </view>
 </template>
@@ -152,13 +156,16 @@ export default {
       }
   },
   methods:{
+    confirmGetBlue(){
+      console.log('aaaab')
+      this.pageTo({url:'/pages/home/blue'})
+    },
     printFn(info){
+      let that = this
       // #ifdef APP-PLUS
       plug.state({},ret=>{
         if(ret.code == 1){
-          that.$util.confirmModal({content:'您还没有连接蓝牙，请先链接'},() => {
-            that.pageTo({url:'/pages/home/blue'})
-          })
+          that.$refs.bluetoothRef.open('center')
         }else{
           let currentNum = parseFloat(Number(info.num))
           if(Number(currentNum)<0){