del

ghsPad/src/pages/home/blue.vue

@@ -1,413 +0,0 @@
-<template>
-<view class="app-content">
-	<view class="content">
-		<view>
-			<button @click="openDefault" >连接</button>
-			<!-- <button @click="open" >打开自定义蓝牙搜索页面</button>
-			<button @click="connectIP" >端口ip连接标签机</button>
-			<button @click="connectUSB" >USB 连接标签机</button> -->
-			<!-- <button @click="printer" >打印小票</button> -->
-			<!-- <button @click="printerLable" >打印样签</button>	 -->
-			<!-- <button @click="writePDFToTsc" >标签打印PDF</button>
-			<button @click="writePDFToEsc" >小票打印PDF</button>
-			<button @click="writeTSC" >tsc指令打印</button> -->
-			<!-- <button @click="state" >标签机状态</button> -->
-			<button @click="dis" >断开</button>
-			<text style="font-size:10upx;">{{tip}}</text>
-		</view>
-	</view>
-</view>
-</template>
-<script>
-// #ifdef APP-PLUS
-const plug= uni.requireNativePlugin('Html5app-Gprinter')
-// #endif
-export default {
-	data() {
-		return {
-			tip: ''
-		}
-	},
-	methods: {
-		openDefault()
-		{
-			//蓝牙连接标签机
-			const that=this;
-			plug.BluetoothPort({setBackgroundColor:"#2088d2"},result=>{
-				if(result.code == 3){
-					that.$msg('连接成功')
-					setTimeout(function(){
-						uni.navigateBack()
-					},2000)
-					that.tip=''
-				}else{
-					that.tip=JSON.stringify(result)
-				}
-			})
-		},
-		open(){
-			uni.navigateTo({ "url":"./Bluetooth" })
-		},
-		connectIP()
-		{
-			//端口网络连接
-			let that=this;
-			plug.connectIP({},ret=>{	
-				that.tip=JSON.stringify(ret)
-			})
-		},
-		connectUSB()
-		{
-			//USB网络连接
-			let that=this;
-			plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{	
-				that.tip=JSON.stringify(ret)
-			});
-		},
-		state(){
-			//查询标签机状态
-			let that=this;
-			plug.state({},ret=>{
-				that.tip=JSON.stringify(ret.msg)
-			});
-		},
-		dis()
-		{
-			//断开标签机
-			let that=this;
-			plug.disconnect({},ret=>{	
-				that.tip=JSON.stringify(ret.msg)
-			});
-		},
-		printer(){
-			//标签机小票
-			const that=this;
-			plug.printer({"ESC":that.setDate()},ret=>{
-				that.tip=JSON.stringify(ret)
-			})
-		},
-		printerLable(){
-			//打印标签
-			const that=this;
-			plug.printer({"TSC":that.OrderLable('粉红雪山','11054')},ret=>{
-				that.tip=JSON.stringify(ret);
-			})
-		},
-		writePDFToTsc()
-		{
-			//打印pdf 档标签文件
-			let filePath=plus.io.convertLocalFileSystemURL("static/pdfFile.pdf");
-			plug.writePDFToTsc({filePath:filePath,width:400},ret=>{
-			
-			});
-		},
-		writePDFToEsc()
-		{
-			//打印pdf 档小票文件
-			let filePath=plus.io.convertLocalFileSystemURL("static/pdfFile.pdf");
-			plug.writePDFToEsc({filePath:filePath,width:400},ret=>{
-			
-			});
-		},
-		writeTSC()
-		{
-			//打印图片和文字
-			let image=plus.io.convertLocalFileSystemURL("static/gprinter.png");
-			
-			//图片指令，BITMAP x,y,宽度,图片路径 ,四个参数组成
-			
-			const that=this;
-			let str="SIZE 40 mm,15 mm \n";
-				str+="GAP 2 mm,0 mm \n";
-				str+"SET RESPONSE NO \n";
-				str+="CLS \n";
-				str+="TEXT 50,50,\"3\",0,1,1,\"DEMO FOR TEXT\" \n";
-				str+="BITMAP 20,20,100,"+image+" \n";
-				str+=" PRINT 1 \n";
-
-			plug.writeTSC({"tsc":str},function(e){
-					that.tip=JSON.stringify(e);
-			});
-			
-		},
-		setDate()
-		{
-			//打印小票
-			const that=this;
-			
-			//制作小票格式， 
-			var data=[];  //定义一个数组
-			var line={};  //每添加一个，代表一行字
-			
-			var filePath=plus.io.convertLocalFileSystemURL("static/gprinter.png");
-			//加入logo图片
-			var Path=filePath; 
-			line.image=Path;
-			line.width="350";
-			line.center="center";
-			line.bottom="1";
-			data.push(line);
-			
-			line={};
-			line.text="万达广场欢迎您";
-			line.center="center";
-			line.font="max";
-			line.bottom="3";
-			data.push(line); //每添加一个，代表一行字
-
-			line={};
-			line.text="收银员:00056";
-			line.center="left";
-			line.font="bold";
-			line.bottom="2";
-			data.push(line);
-			
-			line={};  
-			line.text="单号:00256933";
-			line.center="left";
-			line.font="normal";
-			line.bottom="2";
-			data.push(line);
-			
-			line={};  
-			line.text="业务日期：2019-05-30 18:15:25";
-			line.center="left";
-			line.font="normal";
-			line.bottom="1";
-			data.push(line);
-			
-			line={};
-			line.text="------------------------------";
-			line.center="left";
-			line.font="normal";
-			line.bottom="1";
-			data.push(line);
-			
-			//商品列表，示例
-			for(let i=0;i<4;i++)
-			{
-							
-			line={};
-			line.text="商品名称：小黑瓶眼霜";
-			line.center="left";
-			line.font="normal";
-			line.bottom="1";
-			data.push(line);
-			
-			line={};
-			line.title=["数量：1","单价：305","金额：305"];
-			line.left=[0,30,60];
-			line.center="left";
-			line.font="normal";
-			line.bottom="2";
-			data.push(line);
-								
-			}
-			
-			line={}; //清空一下
-			
-			line.text="------------------------------";
-			line.center="left";
-			line.font="normal";
-			line.bottom="2";
-			data.push(line);
-			
-			line={};
-			line.text="数量：4 ,金额：￥1220.00";
-			line.center="left";
-			line.font="bold";
-			line.bottom="1";
-			data.push(line);
-			
-			line={};
-			line.text="实收金额：￥1220.00";
-			line.center="left";
-			line.font="bold";
-			line.bottom="2";
-			data.push(line);
-			
-			line={};
-			line.text="活动期间满500送100";
-			line.center="left";
-			line.font="normal";
-			line.bottom="1";
-			data.push(line);
-			line={};
-			line.text="折让金额500";
-			line.center="left";
-			line.font="normal";
-			line.bottom="1";
-			data.push(line);
-			line={};
-			line.text="折后金额2029";
-			line.center="left";
-			line.font="normal";
-			line.bottom="3";
-			data.push(line);
-			
-			line={};
-			line.text="30天内可凭小票换开发票";
-			line.center="left";
-			line.font="normal";
-			line.bottom="2";
-			data.push(line);
-			line={};
-			line.text="活动商品，不退不换";
-			line.center="left";
-			line.font="normal";
-			line.bottom="2";
-			data.push(line);
-			
-			//加入条型码
-			line={};
-			line.barcode="2019563352660";
-			line.type="CODE128";
-			line.height="100";
-			line.position="BELOW";
-			line.width="2";
-			line.center="center";
-			line.bottom="2";
-			data.push(line);
-			
-			
-				//加入二维码
-			line={};
-			line.qrcode="d68242b5e540aa7f21173c2d65b2c5ad";
-			line.size="10";
-			line.center="center";
-			line.bottom="0";
-			line.errorlevel="L";
-			
-			
-			data.push(line);
-			
-			// line={};
-			// //加入图片
-			// line.image="http://www.html5-app.com/uploads/file/20190307/20190307172436572807.png";
-			// line.width="150";
-			// line.center="center";
-			// line.bottom="3";
-			// data.push(line);
-				
-			return data;
-			
-		},
-		OrderLable(itemName,itemId){
-			
-			//制作标签格式， 
-			var data=[];  //定义一个数组
-			var line={};  //每添加一个，代表一行字
-			
-			//设置标签纸大小
-			line={};
-			line.width=30; //mm
-			line.height=20; //mm
-			line.gap=2; //标签纸之间，间隙长度 mm
-			line.page=1; //打印几份
-			data.push(line); //每添加一个，代表一行字
-
-				//添加文字
-			line={};
-			line.text= itemName;
-			line.rotation=0;
-			line.x=35;
-			line.y=20;
-			line.xscal=1;
-			line.yscal=1;
-			data.push(line); //每添加一个，代表一行字
-
-			//添加条型码
-			line={};
-			line.barcode=itemId;
-			line.x=35;
-			line.y=55;
-			line.type="CODE128";
-			line.height=50;
-			line.readable=true;
-			line.rotation=0;
-			data.push(line);
-
-			return data;
-		},
-		Lable(){
-			
-			//制作标签格式， 
-			var data=[];  //定义一个数组
-			var line={};  //每添加一个，代表一行字
-			
-			//设置标签纸大小
-			line={};
-			line.width=40; //mm
-			line.height=30; //mm
-			line.gap=3; //标签纸之间，间隙长度 mm
-			line.page=1; //打印几份
-			data.push(line); //每添加一个，代表一行字
-
-			//添加图片
-			line={};
-			line.image="http://www.html5-app.com/gprinter.png";
-			line.x=30;
-			line.y=20;
-			line.width=70;
-			data.push(line);
-			
-			
-				//添加文字
-			line={};
-			line.text="HTML5+混合APP开发社区";
-			line.rotation=0;
-			line.x=30;
-			line.y=90;
-			line.xscal=1;
-			line.yscal=1;
-			data.push(line); //每添加一个，代表一行字
-			
-			//添加条型码
-			line={};
-			line.barcode="2019563352660";
-			line.x=30;
-			line.y=130;
-			line.type="CODE128";
-			line.height=50;
-			line.readable=true;
-			line.rotation=0;
-			data.push(line);
-			
-				//加入二维码
-			line={};
-			line.qrcode="1234566";	
-			line.x=190;
-			line.y=20;
-			line.width=3
-			line.rotation=0;
-			data.push(line);
-			
-			//添加黑块
-			line={};
-			line.addBar={x:25,y:2,width:300,height:3};
-			data.push(line);
-			
-			//添加方框
-			line={};
-			line.addBox={x:25,y:15,xend:300,yend:120,thickness:2};
-			data.push(line);
-			
-			return data;
-		}
-
-	}
-}
-</script>
-<style>
-	.content {
-		margin: 10px;
-		margin-top:30px;
-	}
-	button{ 
-		margin-bottom: 25px;
-		background-color: #3385ff;
-		color:white;
-		height:35upx;
-		line-height: 35upx;
-	}
-</style>

ghsPad/src/pages/home/make.vue

@@ -1,173 +0,0 @@
-<template>
-    <view>
-        <view class="app-casher-area">
-            <view class="nav-left">
-                <casherNav navType="selItem"></casherNav>
-            </view>
-            <!-- 已选花材列表 -->
-            <view class="itemList-box">
-                <leftItem :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"></leftItem>
-            </view>
-            <!-- 分类和花材图片 -->
-            <view class="all-item-area">
-                <rightItem :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightItem>
-            </view>
-            <!-- 按钮操作 -->
-            <view class="open-box">
-				<view class="button-area">
-					<view class="active" @click="commit()">提交</view>
-					<view class="active" @click="clearItemFn">清空</view>
-				</view>
-            </view>
-
-			<!-- 完成制作单弹框 -->
-			<uni-popup ref="createWorkRef" background-color="#fff" type="right">
-				<createWork @cancelCreate="cancelCreate()" @confirmCreate="confirmCreate()"></createWork>
-			</uni-popup>
-
-			<!-- 清空 -->
-			<uni-popup ref="clearItemRef" type="dialog">
-				<uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认清空？" @confirm="confirmClearItem"></uni-popup-dialog>
-			</uni-popup>
-
-        </view>
-    </view>
-</template>
-<script>
-import { mapGetters } from "vuex";
-import rightItem from './components/rightItem.vue'
-import leftItem from './components/leftArea.vue'
-import casherNav from './components/nav.vue'
-import productMins from "@/mixins/product"
-import createWork from './components/createWork.vue'
-export default {
-	name: "make",
-	components: { rightItem,leftItem, casherNav,createWork},
-	mixins: [productMins],
-	data() {
-		return {
-			//0成品 1花材
-			currentProperty:0,
-			itemList:[],
-			currenSelectShop:{},
-			selectItem: {},
-			selectItemUser:{},
-			isLogin:2,
-			customId:0,
-            currentJobType:'make',
-            currentJobId:0,
-			chooseCustomer:false
-		}
-	},
-	computed: {
-		...mapGetters(["getLoginInfo"])
-	},
-	onLoad() {
-		this.initDataFromStorage()
-	},
-	onPullDownRefresh() {
-	},
-	onShow() {
-	},
-	created(){
-	},
-	mounted() {
-		if(this.$util.isEmpty(this.getLoginInfo.admin) || this.getLoginInfo.admin.currentShopId == 0){
-			this.isLogin = 0
-		}else{
-			this.isLogin = 1
-		}
-	},
-	watch:{
-		getLoginInfo: {
-			handler(newValue) {
-				if(this.$util.isEmpty(newValue.admin) == false && newValue.admin.currentShopId > 0){
-					this.isLogin = 1
-				}else{
-					this.isLogin = 0
-				}
-			}
-		}
-	},
-	methods: {
-		cancelCreate(){
-			this.$refs.createWorkRef.close()
-		},
-		confirmCreate(){
-			this.$refs.createWorkRef.close()
-		},
-		commit(){
-			this.$util.hitVoice()
-			if(this.$util.isEmpty(this.selectList)) {
-				this.$msg('请选择花材')
-				return false
-			}
-			this.$refs.createWorkRef.open('center')
-		},
-		clearItemFn(){
-			this.$util.hitVoice()
-			this.$refs.clearItemRef.open()
-		},
-		//确认清空花材
-		confirmClearItem(){
-			this.$util.hitVoice()
-			this.removeFromSaveDirect()
-		},
-		changeProperty(property){
-			this.currentProperty = property
-		},
-		resetCustomer(){
-			this.chooseCustomer = true
-		},
-		selectCustomer(info){
-			this.customId = info.id ? parseInt(info.id) : 0
-			this.currentJobId = this.customId
-		},
-		init() {
-		},
-	}
-};
-</script>
-<style lang="scss" scoped>
-.app-casher-area {
-	display: flex;
-	height: 100vh;
-	& .all-item-area {
-		flex: 76;
-	}
-	& .nav-left {
-		flex: 5;
-		background-color: rgba(72, 91, 107, 1);
-	}
-	& .itemList-box {
-		flex: 30;
-	}
-	& .open-box {
-		flex: 8;
-		.button-area {
-			height: 100vh;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-around;
-			padding: 5upx;
-			padding-top: 12upx;
-			& > view {
-				border: 1upx solid #CCCCCC;
-				border-radius: 5upx;
-				text-align: center;
-				padding: 10upx 0;
-				color: #666666;
-				margin-bottom: 10upx;
-				font-size: 10upx;
-				text-align: center;
-			}
-			& .active {
-				color: #3385FF;
-				border-color: #3385FF;
-				font-size: 10upx;
-				font-weight:bold;
-			}
-		}
-	}
-}
-</style>

ghsPad/src/pages/home/modify.vue

@@ -1,153 +0,0 @@
-<template>
-    <view>
-        <view class="app-casher-area">
-            <view class="nav-left"> </view>
-            <!-- 已选花材列表 -->
-            <view class="itemList-box">
-                <leftArea :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"></leftArea>
-            </view>
-            <!-- 分类和花材图片 -->
-            <view class="all-item-area">
-                <rightItem :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightItem>
-            </view>
-            <!-- 按钮操作 -->
-            <view class="open-box">
-				<view class="button-area">
-					<view class="active" @click="clearItemFn">清空</view>
-					<view class="active" @click="confirmModify">确认</view>
-					<view class="active" @click="cancel">取消</view>
-				</view>
-            </view>
-			<!-- 清空 -->
-			<uni-popup ref="clearItemRef" type="dialog">
-				<uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认清空？" @confirm="confirmClearItem"></uni-popup-dialog>
-			</uni-popup>
-        </view>
-    </view>
-</template>
-<script>
-import { mapGetters } from "vuex"
-import rightItem from './components/rightItem.vue'
-import leftArea from './components/leftArea.vue'
-import productMins from "@/mixins/product"
-import { getFullInfo } from '@/api/work'
-import {modifyItem} from '@/api/work-item'
-export default {
-	name: "modify",
-	components: { rightItem,leftArea},
-	mixins: [productMins],
-	data() {
-		return {
-			selectItem: {},
-			selectItemUser:{},
-            currentJobType:'modify',
-            currentJobId:0,
-			orderItem:[]
-		}
-	},
-	computed: {
-		...mapGetters(["getLoginInfo"])
-	},
-	methods: {
-		//清空花材弹框
-		clearItemFn(){
-			this.$util.hitVoice()
-			this.$refs.clearItemRef.open()
-		},
-		//确认清空花材
-		confirmClearItem(){
-			this.$util.hitVoice()
-			this.removeFromSaveDirect()
-		},
-		cancel(){
-			this.$util.hitVoice()
-			uni.navigateBack({delta: 1})
-		},
-		confirmModify(){
-			this.$util.hitVoice()
-			if(this.$util.isEmpty(this.selectList)){
-				this.$msg('请选择花材')
-				return false
-			}
-			const product = this.selectList.map(e => {
-				return { productId: e.id, unitType:e.unitType,num:e.currentNum,unitPrice:e.unitPrice}
-			})
-			modifyItem({product:JSON.stringify(product),id:this.option.id}).then(res=>{
-				if(res.code == 1){
-					this.$msg('修改成功')
-
-					//返回上一页带参数
-					let pages = getCurrentPages();
-					let prevPage = pages[ pages.length - 2 ];
-					//修改上一页data里面的modifyInfo
-					prevPage.$vm.modifyInfo = {hasModify:1}
-
-					setTimeout(function(){
-						uni.navigateBack()
-					},1500)
-				}
-			})
-		},
-		getOrderDetail(id){
-			getFullInfo({id}).then(res=>{
-				if(res.code == 1){
-					if(res.data.item && !this.$util.isEmpty(res.data.item)){
-						const newItem = res.data.item.map(ele=>{
-							return {property:1,name:ele.name,unitType:ele.unitType,unitPrice:ele.unitPrice,unitName:ele.unitName,currentNum:ele.num,id:ele.itemId}
-						})
-						this.setSelectInfo({ currentJobType: this.currentJobType, info: newItem,currentJobId:this.currentJobId })
-					}
-				}
-			})
-		},
-		init(){
-			let id = this.option.id || 0
-			this.currentJobId = Number(id)
-			this.getOrderDetail(id)
-		}
-	}
-};
-</script>
-<style lang="scss" scoped>
-.app-casher-area {
-	display: flex;
-	height: 100vh;
-	& .all-item-area {
-		flex: 76;
-	}
-	& .nav-left {
-		flex: 5;
-		background-color: rgba(72, 91, 107, 1);
-	}
-	& .itemList-box {
-		flex: 30;
-	}
-	& .open-box {
-		flex: 8;
-		.button-area {
-			height: 100vh;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-around;
-			padding: 5upx;
-			padding-top: 12upx;
-			& > view {
-				border: 1upx solid #CCCCCC;
-				border-radius: 5upx;
-				text-align: center;
-				padding: 10upx 0;
-				color: #666666;
-				margin-bottom: 10upx;
-				font-size: 10upx;
-				text-align: center;
-			}
-			& .active {
-				color: #3385FF;
-				border-color: #3385FF;
-				font-size: 10upx;
-				font-weight:bold;
-			}
-		}
-	}
-}
-</style>

ghsPad/src/pages/home/selectMake.vue

@@ -1,178 +0,0 @@
-<template>
-    <view>
-        <view class="app-casher-area">
-            <view class="nav-left">
-                <casherNav navType="selGoods"></casherNav>
-            </view>
-            <!-- 已选商品列表 -->
-            <view class="itemList-box">
-                <leftArea :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"></leftArea>
-            </view>
-            <!-- 成品 -->
-            <view class="all-item-area">
-                <rightGoods :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId" :changeCheckStock="checkStock" :changeFlower="changeFlower"></rightGoods>
-            </view>
-            <!-- 按钮操作 -->
-            <view class="open-box">
-				<view class="button-area">
-					<view class="active" @click="showCommitFn()">提交</view>
-					<view class="active" @click="clearItemFn">清空</view>
-				</view>
-            </view>
-
-			<!-- 清空 -->
-			<uni-popup ref="clearItemRef" type="dialog">
-				<uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认清空？" @confirm="confirmClearItem"></uni-popup-dialog>
-			</uni-popup>
-
-			<uni-popup ref="commitRef" type="dialog">
-				<uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认提交？" @confirm="commitMake"></uni-popup-dialog>
-			</uni-popup>
-
-        </view>
-    </view>
-</template>
-<script>
-import { mapGetters } from "vuex";
-import rightGoods from './components/rightGoods.vue'
-import leftArea from './components/leftArea.vue'
-import casherNav from './components/nav.vue'
-import productMins from "@/mixins/product"
-import {goodsCreateFn} from '@/api/work'
-export default {
-	name: "make",
-	components: { rightGoods,leftArea, casherNav},
-	mixins: [productMins],
-	data() {
-		return {
-			//0成品 1花材
-			currentProperty:0,
-			itemList:[],
-			currenSelectShop:{},
-			selectItem: {},
-			selectItemUser:{},
-			isLogin:2,
-			customId:0,
-            currentJobType:'selectMake',
-            currentJobId:0,
-			chooseCustomer:false,
-			checkStock:false,
-			changeFlower:1
-		}
-	},
-	computed: {
-		...mapGetters(["getLoginInfo"])
-	},
-	onLoad() {
-		this.initDataFromStorage()
-	},
-	onPullDownRefresh() {
-	},
-	onShow() {
-	},
-	mounted() {
-		if(this.$util.isEmpty(this.getLoginInfo.admin) || this.getLoginInfo.admin.currentShopId == 0){
-			this.isLogin = 0
-		}else{
-			this.isLogin = 1
-		}
-	},
-	watch:{
-		getLoginInfo: {
-			handler(newValue) {
-				if(this.$util.isEmpty(newValue.admin) == false && newValue.admin.currentShopId > 0){
-					this.isLogin = 1
-				}else{
-					this.isLogin = 0
-				}			
-			}
-		}
-	},
-	methods: {
-		showCommitFn(){
-			this.$refs.commitRef.open('center')
-		},
-		commitMake(){
-			if(this.$util.isEmpty(this.selectList)){
-				this.$msg('请选择商品')
-				return false
-			}
-			let goods = this.selectList.map(ele=>{
-				return {productId:ele.id,num:ele.currentNum}
-			})
-			uni.showLoading({mask:true})
-			goodsCreateFn({goods:JSON.stringify(goods)}).then(res=>{
-				uni.hideLoading()
-				if(res.code == 1){
-					this.$msg(res.msg)
-					this.confirmClearItem()
-				}
-			})
-		},
-		clearItemFn(){
-			this.$util.hitVoice()
-			this.$refs.clearItemRef.open()
-		},
-		changeProperty(property){
-			this.currentProperty = property
-		},
-		resetCustomer(){
-			this.chooseCustomer = true
-		},
-		selectCustomer(info){
-			this.customId = info.id ? parseInt(info.id) : 0
-			this.currentJobId = this.customId
-		},
-		init() {
-		},
-		//确认清空花材
-		confirmClearItem(){
-			this.$util.hitVoice()
-			this.removeFromSaveDirect()
-		},
-	}
-};
-</script>
-<style lang="scss" scoped>
-.app-casher-area {
-	display: flex;
-	height: 100vh;
-	& .all-item-area {
-		flex: 76;
-	}
-	& .nav-left {
-		flex: 5;
-		background-color: rgba(72, 91, 107, 1);
-	}
-	& .itemList-box {
-		flex: 30;
-	}
-	& .open-box {
-		flex: 8;
-		.button-area {
-			height: 100vh;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-around;
-			padding: 5upx;
-			padding-top: 12upx;
-			& > view {
-				border: 1upx solid #CCCCCC;
-				border-radius: 5upx;
-				text-align: center;
-				padding: 10upx 0;
-				color: #666666;
-				margin-bottom: 10upx;
-				font-size: 10upx;
-				text-align: center;
-			}
-			& .active {
-				color: #3385FF;
-				border-color: #3385FF;
-				font-size: 10upx;
-				font-weight:bold;
-			}
-		}
-	}
-}
-</style>

ghsPad/src/pages/home/uniPopup.vue

@@ -1,275 +0,0 @@
-<template>
-	<view class="container">
-		<uni-card is-full :is-shadow="false">
-			<text class="uni-h6">弹出层组件用于弹出一个覆盖到页面上的内容，使用场景如：底部弹出分享弹窗、页面插屏广告等。</text>
-		</uni-card>
-		<uni-section title="基本示例" type="line">
-			<view class="example-body box">
-				<button class="button" type="primary" @click="toggle('top')"><text class="button-text">顶部</text></button>
-				<button class="button" type="primary" @click="toggle('bottom')"><text class="button-text">底部</text></button>
-				<button class="button" type="primary" @click="toggle('center')"><text class="button-text">居中</text></button>
-				<button class="button" type="primary" @click="toggle('left')"><text class="button-text">左侧</text></button>
-				<button class="button" type="primary" @click="toggle('right')"><text class="button-text">右侧</text></button>
-			</view>
-		</uni-section>
-
-		<uni-section title="提示消息" type="line">
-			<view class="example-body box">
-				<button class="button popup-success" @click="messageToggle('success')"><text
-						class="button-text success-text">成功</text></button>
-				<button class="button popup-error" @click="messageToggle('error')"><text
-						class="button-text error-text">失败</text></button>
-				<button class="button popup-warn" @click="messageToggle('warn')"><text
-						class="button-text warn-text">警告</text></button>
-				<button class="button popup-info" @click="messageToggle('info')"><text
-						class="button-text info-text">信息</text></button>
-			</view>
-		</uni-section>
-
-
-		<uni-section title="对话框示例" type="line" class="hideOnPc">
-			<view class="example-body box">
-				<button class="button popup-success" @click="dialogToggle('success')"><text
-						class="button-text success-text">成功</text></button>
-				<button class="button popup-error" @click="dialogToggle('error')"><text
-						class="button-text error-text">失败</text></button>
-				<button class="button popup-warn" @click="dialogToggle('warn')"><text
-						class="button-text warn-text">警告</text></button>
-				<button class="button popup-info" @click="dialogToggle('info')"><text
-						class="button-text info-text">信息</text></button>
-			</view>
-		</uni-section>
-
-		<uni-section title="输入框示例" type="line" padding>
-			<view class="dialog-box">
-				<text class="dialog-text">输入内容：{{ value }}</text>
-			</view>
-			<button class="button" type="primary" @click="inputDialogToggle"><text
-					class="button-text">输入对话框</text></button>
-
-		</uni-section>
-		<uni-section title="底部分享示例" type="line" padding>
-			<button class="button" type="primary" @click="shareToggle"><text class="button-text">分享模版示例</text></button>
-		</uni-section>
-		<view>
-			<!-- 普通弹窗 -->
-			<uni-popup ref="popup" background-color="#fff" @change="change">
-				<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }"><text
-						class="text">popup 内容</text></view>
-			</uni-popup>
-		</view>
-
-		<view>
-			<!-- 提示信息弹窗 -->
-			<uni-popup ref="message" type="message">
-				<uni-popup-message :type="msgType" :message="messageText" :duration="2000"></uni-popup-message>
-			</uni-popup>
-		</view>
-
-		<view>
-			<!-- 提示窗示例 -->
-			<uni-popup ref="alertDialog" type="dialog">
-				<uni-popup-dialog :type="msgType" cancelText="关闭" confirmText="同意" title="通知" content="欢迎使用 uni-popup!" @confirm="dialogConfirm"
-					@close="dialogClose"></uni-popup-dialog>
-			</uni-popup>
-		</view>
-
-		<view>
-			<!-- 输入框示例 -->
-			<uni-popup ref="inputDialog" type="dialog">
-				<uni-popup-dialog ref="inputClose"  mode="input" title="输入内容" value="对话框预置提示内容!"
-					placeholder="请输入内容" @confirm="dialogInputConfirm"></uni-popup-dialog>
-			</uni-popup>
-		</view>
-
-		<view>
-			<!-- 分享示例 -->
-			<uni-popup ref="share" type="share" safeArea backgroundColor="#fff">
-				<uni-popup-share></uni-popup-share>
-			</uni-popup>
-		</view>
-	</view>
-</template>
-<script>
-	export default {
-		data() {
-			return {
-				type: 'center',
-				msgType: 'success',
-				messageText: '这是一条成功提示',
-				value: ''
-			}
-		},
-		onReady() {},
-		methods: {
-			change(e) {
-				console.log('当前模式：' + e.type + ',状态：' + e.show);
-			},
-			toggle(type) {
-				this.type = type
-				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-				this.$refs.popup.open(type)
-			},
-			messageToggle(type) {
-				this.msgType = type
-				this.messageText = `这是一条${type}消息提示`
-				this.$refs.message.open()
-			},
-			dialogToggle(type) {
-				this.msgType = type
-				this.$refs.alertDialog.open()
-			},
-			dialogConfirm() {
-				console.log('点击确认')
-				this.messageText = `点击确认了 ${this.msgType} 窗口`
-				this.$refs.message.open()
-			},
-			inputDialogToggle() {
-				this.$refs.inputDialog.open()
-			},
-			dialogClose() {
-				console.log('点击关闭')
-			},
-			dialogInputConfirm(val) {
-				uni.showLoading({
-					title: '3秒后会关闭'
-				})
-
-				setTimeout(() => {
-					uni.hideLoading()
-					console.log(val)
-					this.value = val
-					// 关闭窗口后，恢复默认内容
-					this.$refs.inputDialog.close()
-				}, 3000)
-			},
-			shareToggle() {
-				this.$refs.share.open()
-			}
-		}
-	}
-</script>
-<style lang="scss">
-	@mixin flex {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-
-	@mixin height {
-		/* #ifndef APP-NVUE */
-		height: 100%;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		flex: 1;
-		/* #endif */
-	}
-
-	.box {
-		@include flex;
-	}
-
-	.button {
-		@include flex;
-		align-items: center;
-		justify-content: center;
-		flex: 1;
-		height: 35px;
-		margin: 0 5px;
-		border-radius: 5px;
-	}
-
-	.example-body {
-		background-color: #fff;
-		padding: 10px 0;
-	}
-
-	.button-text {
-		color: #fff;
-		font-size: 12px;
-	}
-
-	.popup-content {
-		@include flex;
-		align-items: center;
-		justify-content: center;
-		padding: 15px;
-		height: 50px;
-		background-color: #fff;
-	}
-
-	.popup-height {
-		@include height;
-		width: 200px;
-	}
-
-	.text {
-		font-size: 12px;
-		color: #333;
-	}
-
-	.popup-success {
-		color: #fff;
-		background-color: #e1f3d8;
-	}
-
-	.popup-warn {
-		color: #fff;
-		background-color: #faecd8;
-	}
-
-	.popup-error {
-		color: #fff;
-		background-color: #fde2e2;
-	}
-
-	.popup-info {
-		color: #fff;
-		background-color: #f2f6fc;
-	}
-
-	.success-text {
-		color: #09bb07;
-	}
-
-	.warn-text {
-		color: #e6a23c;
-	}
-
-	.error-text {
-		color: #f56c6c;
-	}
-
-	.info-text {
-		color: #909399;
-	}
-
-	.dialog,
-	.share {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-	}
-
-	.dialog-box {
-		padding: 10px;
-	}
-
-	.dialog .button,
-	.share .button {
-		/* #ifndef APP-NVUE */
-		width: 100%;
-		/* #endif */
-		margin: 0;
-		margin-top: 10px;
-		padding: 3px 0;
-		flex: 1;
-	}
-
-	.dialog-text {
-		font-size: 14px;
-		color: #333;
-	}
-</style>

ghsPad/src/pages/home/work.vue

@@ -1,65 +0,0 @@
-<template>
-<view>
-    <view>
-        <view class="app-casher-area">
-            <view class="nav-left">
-                <casherNav navType="work"></casherNav>
-            </view>
-            <view class="work-list">
-                <workList @getOrder="getOrder"></workList>
-            </view>
-            <view class="work-info">
-                <workInfo ref="workInfoRef"></workInfo>
-            </view>
-        </view>
-    </view>
-</view>
-</template>
-<script>
-import { mapGetters } from "vuex";
-import productMins from "@/mixins/product";
-import casherNav from './components/nav.vue'
-import workList from './components/workList.vue'
-import workInfo from './components/workInfo.vue'
-export default {
-	name: "work",
-	components: {casherNav,workList,workInfo},
-	mixins: [productMins],
-	data() {
-		return {
-			selectOrderId:0,
-			modifyInfo:{hasModify:0}
-		}
-	},
-	computed: {
-		...mapGetters(["getLoginInfo"])
-	},
-	onShow() {
-		if(this.modifyInfo.hasModify && this.modifyInfo.hasModify == 1){
-			this.$refs.workInfoRef.getOrderDetail(this.selectOrderId)
-		}
-	},
-	methods: {
-		getOrder(item){
-			this.selectOrderId = Number(item.id)
-			this.$refs.workInfoRef.getOrderDetail(this.selectOrderId)
-		}
-	}
-};
-</script>
-<style lang="scss" scoped>
-.app-casher-area {
-	display: flex;
-	height: 100vh;
-	& .nav-left {
-		flex: 5;
-		background-color: rgba(72, 91, 107, 1);
-	}
-	& .work-list {
-		flex: 32;
-	}
-    & .work-info{
-        flex: 89;
-    }
-}
-</style>