工单完成 新款提交

hdApp/src/admin/work/add.vue

@@ -8,6 +8,11 @@
           <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请填写名称" maxlength="50" type="text" />
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">数量</view>
+          <input v-model="form.num" placeholder-class="phcolor" class="tui-input" name="num" @focus="form.num=''" placeholder="请填写数量" maxlength="50" type="number" />
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :arrow="true">
           <view class="tui-title">分类</view>
           <picker mode="selector" :value="form.catId" :range="plantClassData" range-key="categoryName" @change="changePlantClassFn" class="tui-input" >
@@ -17,9 +22,12 @@
           </picker>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">数量</view>
-          <input v-model="form.num" placeholder-class="phcolor" class="tui-input" name="num" @focus="form.num=''" placeholder="请填写数量" maxlength="50" type="number" />
+        <tui-list-cell class="line-cell" :arrow="true">
+          <view class="tui-title">支数</view>
+          <picker mode="selector" :range="flowerNumList" range-key="name" @change="flowerNumChange" class="tui-input">
+            <view v-if="form.flowerNum" style="height:45upx;" >{{flowerNumName}}</view>
+            <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view>
+          </picker>
         </tui-list-cell>
 
       </view>
@@ -74,11 +82,15 @@ export default {
         catId:'',
         cover:[],
         num:'',
-        remark:''
+        remark:'',
+        flowerNum:0
       },
+      flowerNumList:[{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99}],
       categorySelectedData:{},
       plantClassData:[],
-      headers:{token:''}
+      headers:{token:''},
+      flowerIndex:0,
+      flowerNumName:''
     };
   },
 	computed:{
@@ -91,6 +103,11 @@ export default {
   watch:{
   },
   methods: {
+    flowerNumChange(e){
+      let index = e.detail.value
+      this.form.flowerNum = this.flowerNumList[index].num
+      this.flowerNumName = this.flowerNumList[index].name
+    },
     statusChange(e){
       this.form.status = e.detail.value ? 1 : 2;
     },

hdApp/src/api/work/index.js

@@ -1,7 +1,7 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
 export const addWork = data => {
-	return https.get('/work/create', data)
+	return https.post('/work/create', data)
 }
 
 export const getWorkList = data => {

hdPad/src/api/work-item/index.js

@@ -0,0 +1,11 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+//修改花材 ssh 20220425
+export const modifyItem = data => {
+	return https.post('/work-item/modify-item', data)
+}
+
+//修改报损 ssh 20220425
+export const modifyWastage = data => {
+	return https.post('/work-item/modify-wastage', data)
+}

hdPad/src/api/work/index.js

@@ -8,4 +8,9 @@ export const getWorkList = data => {
 //工单详情
 export const getFullInfo = data => {
 	return https.get('/work/full-info', data)
-}
+}
+
+//完成工单 ssh 20220425
+export const finish = data =>{
+	return https.post('/work/finish', data)
+}

hdPad/src/pages/home/cash.vue

@@ -27,7 +27,8 @@
 				</view>
 				<!-- 按钮操作 -->
 				<view class="open-box">
-					<consoleButton :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId" @resetCustomer="resetCustomer" :customId.sync="customId" @changeProperty="changeProperty"></consoleButton>
+					<consoleButton :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId" @resetCustomer="resetCustomer" 
+					:customId.sync="customId" @changeProperty="changeProperty"></consoleButton>
 				</view>
 			</view>
 		</template>

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

@@ -1,13 +1,13 @@
 <template>
 <view class="button-area">
 	<view class="active" @click="changeProperty">{{property==1 ? '花材' : '成品'}}</view>
-	<view @click="gosettleCommit">结算 </view>
-	<view @click="gatheringFn()">收款</view>
-	<view @click="resetCustomer">选客</view>
-	<view @click="calcFn">{{calc == 'add' ? '+' : '-'}}</view>
-    <view @click="toWastage">报损</view>
-    <view @click="clearItemFn">清空</view>
-	<view @click="logoutFn">退出</view>
+	<view class="active" @click="gosettleCommit">结算 </view>
+	<view class="active" @click="gatheringFn()">收款</view>
+	<view class="active" @click="resetCustomer">选客</view>
+	<view class="active" @click="calcFn">{{calc == 'add' ? '+' : '-'}}</view>
+    <view class="active" @click="toWastage">报损</view>
+    <view class="active" @click="clearItemFn">清空</view>
+	<view class="active" @click="logoutFn">退出</view>
 
     <!-- 清空 -->
     <uni-popup ref="clearItemRef" type="dialog">
@@ -295,8 +295,8 @@ export default {
         text-align: center;
     }
 	& .active {
-		color: #1627be;
-		border-color: #1627be;
+		color: #3385FF;
+		border-color: #3385FF;
 		font-size: 10upx;
 		font-weight:bold;
 	}

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

@@ -1,7 +1,7 @@
 <template>
     <view class="finish-area">
         <view class="cell-item">
-          <view class="item"><text class="left">名称</text> <input placeholder="请填写名称" placeholder-class="gray" /></view>
+          <view class="item"><text class="left">名称</text> <input v-model="form.name" placeholder="请填写名称" placeholder-class="gray" /></view>
           <view class="item">
             <text class="left">分类</text>
             <view class="class-item-list">
@@ -32,8 +32,8 @@
           </view>
         </view>
         <view class="footer">
-            <button>取消</button>
-            <button>确认</button>
+            <button @click="cancelFinish()">取消</button>
+            <button @click="confirmFinish()">确认</button>
         </view>
     </view>
 </template>
@@ -49,7 +49,14 @@ export default {
         return {
             print:1,
             flowerNum:0,
-            flowerNumList:[{num:0,name:'无'},{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99}]
+            flowerNumList:[{num:0,name:'无'},{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99}],
+            form:{
+                name:'',
+                catId:0,
+                flowerNum:0,
+                cover:'',
+                print:0
+            }
         }
     },
     methods:{
@@ -59,8 +66,11 @@ export default {
         changePrint(){
 
         },
-        cancelPay(){
-
+        cancelFinish(){
+            this.$emit('cancelFinish')
+        },
+        confirmFinish(){
+            this.$emit('confirmFinish',this.form)
         }
     },
     watch:{

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

@@ -7,6 +7,7 @@
           <image :src="orderInfo.cover"></image>
         </view>
         <view class="order-item">
+          <view><text class="left">支数</text><text class="right">{{orderInfo.flowerNum}}</text></view>
           <view><text class="left">分类</text><text class="right">{{orderInfo.catName}}</text></view>
           <view><text class="left">名称</text><text class="right">{{orderInfo.name}}</text></view>
           <view><text class="left">数量</text><text class="right">{{orderInfo.num}}</text></view>
@@ -30,18 +31,21 @@
                 <view class="info-line">
                   <text class="item-name">{{ s.name }}</text>
                   <text class="item-price">
-                    <text class="unit">5扎</text>
+                    <text class="unit">{{s.num}}{{s.unitName}}</text>
                   </text>
                 </view>
                 <view class="info-line">
-                  <text class="item-type">20支/扎</text>
+                  <text class="item-type">{{s.ratio}}{{s.smallName}}/{{s.bigName}}</text>
                 </view>
               </view>
             </view>
           </view>
           <view class="summary-bar">
             <view class="operate-view" ></view>
-            <view class="describe-view"><text>2扎</text> <text>3支</text></view>
+            <view class="describe-view">
+              <text v-if="Number(unitUseItem.bigNum)>0">{{unitUseItem.bigNum}}扎</text>
+              <text v-if="Number(unitUseItem.smallNum)>0">{{unitUseItem.smallNum}}支</text>
+            </view>
           </view>
         </view>
 
@@ -57,49 +61,59 @@
                 <view class="info-line">
                   <text class="item-name">{{ s.name }}</text>
                   <text class="item-price">
-                    <text class="unit">5扎</text>
+                    <text class="unit">{{(s.num*orderInfo.num).toFixed()}}{{s.unitName}}</text>
                   </text>
                 </view>
                 <view class="info-line">
-                  <text class="item-type">20支/扎</text>
-                  <button class="wastage">报损</button>
+                  <text class="item-type">{{s.ratio}}{{s.smallName}}/{{s.bigName}}</text>
+                  <text style="font-size:9upx;position:relative;right:80upx;top:10upx;" v-if="Number(s.wastNum)>0">{{s.wastNum}}{{s.wastUnitName}}</text>
+                  <button class="wastage" @click="wastageFn(s)">报损</button>
                 </view>
               </view>
             </view>
           </view>
           <view class="summary-bar">
             <view class="operate-view" ></view>
-            <view class="describe-view"><text>2扎</text> <text>3支</text></view>
+            <view class="describe-view">
+              <text v-if="Number(totalUseItem.bigNum)>0">{{totalUseItem.bigNum}}扎</text>
+              <text v-if="Number(totalUseItem.smallNum)>0">{{totalUseItem.smallNum}}支</text>
+            </view>
           </view>
         </view>
       </view>
 
       <view class="button-area">
-        <view class="active" @tap="finish">完成</view>
-        <view @click="modifyItem(orderInfo)">修改</view>
-        <view>打印</view>
-        <view>锁定</view>
-        <view>取消</view>
+        <view :class="[orderInfo.status==0 ? 'active' : '']" @tap="finishFn()">完成</view>
+        <view :class="[orderInfo.stockLock==0 ? 'active' : '']" @click="modifyItem(orderInfo)">修改</view>
+        <view :class="[orderInfo.stockLock==0 ? 'active' : '']" @click="lockFn()">锁定</view>
+        <view :class="[orderInfo.status==1 ? 'active' : '']" @click="printFn()">打印</view>
+        <view :class="[orderInfo.status==0 ? 'active' : '']" @click="cancelFn()">取消</view>
       </view>
 
-      <!-- 完成工单弹框 -->
-      <uni-popup ref="finishWorkRef" background-color="#fff" type="right">
-          <finishWork></finishWork>
+      <!-- 选数量金额 -->
+      <uni-popup ref="wastageSelectNumRef" background-color="#fff" type="center" :animation="false">
+          <wastageSelectNum @confirmWastageSelectNum="confirmWastageSelectNum" :customData.sync="customData" 
+          @cancelWastageSelectNum="cancelWastageSelectNum"></wastageSelectNum>
       </uni-popup>
 
   </view>
 </view>
 </template>
 <script>
-import { getFullInfo } from '@/api/work'
-import finishWork from './finishWork.vue'
+import { getFullInfo,finish } from '@/api/work'
+import {modifyWastage} from '@/api/work-item'
+import wastageSelectNum from './wastageSelectNum.vue'
 export default {
 	name: "orderInfo",
-	components: {finishWork},
+	components: {wastageSelectNum},
   data() {
     return {
       orderInfo:[],
-      orderItem:[]
+      orderItem:[],
+      unitUseItem:{bigNum:0,smallNum:0},
+      totalUseItem:{bigNum:0,smallNum:0},
+      customData:{},
+      workItemId:0
     }
   },
   props: {
@@ -108,6 +122,8 @@ export default {
       default: 0
     }
   },
+  computed:{
+  },
   watch:{
       selectOrderId:{
           handler(newId){
@@ -119,9 +135,45 @@ export default {
       }
   },
   methods:{
-    finish(){
+    printFn(){
+
+    },
+    lockFn(){
+
+    },
+    cancelFn(){
+
+    },
+    wastageFn(item){
+      this.customData = {...item,currentNum:1,property:1}
+      this.$refs.wastageSelectNumRef.open('center')
+      this.workItemId = item.id
+    },
+    confirmWastageSelectNum(info){
+      this.$refs.wastageSelectNumRef.close()
+      modifyWastage({...info,id:this.workItemId,num:info.currentNum}).then(res=>{
+        if(res.code == 1){
+           this.getOrderDetail(this.orderInfo.id)
+        }else{
+          this.$msg('报损失败，请重试')
+        }
+      })
+    },
+    finishFn(){
+
+    },
+    confirmFinish(form){
+      this.$refs.finishWorkRef.close()
+      finish({...form,id:this.orderInfo.id}).then(res=>{
+        if(res.code == 1){
+          this.$msg(res.msg)
+          this.getOrderDetail(this.orderInfo.id)
+        }
+      })
+    },
+    cancelFinish(){
 			this.$util.hitRemind()
-			this.$refs.finishWorkRef.open()
+			this.$refs.finishWorkRef.close()
     },
     modifyItem(info){
       this.$util.hitRemind()
@@ -147,6 +199,24 @@ export default {
         if(res.code == 1){
           this.orderInfo = res.data.info
           this.orderItem = res.data.item
+          let bigNum = 0
+          let smallNum = 0
+          if(!this.$util.isEmpty(this.orderItem)){
+            for (const ele of this.orderItem) {
+              if(ele.unitType ==0){
+                bigNum = bigNum + Number(ele.num)
+              }else{
+                smallNum = smallNum + Number(ele.num)
+              }
+            }
+            bigNum = bigNum.toFixed()
+            smallNum = smallNum.toFixed()
+          }
+          this.unitUseItem = {bigNum,smallNum}
+          let orderNum = this.orderInfo.num || 0
+          let totalBig = (bigNum*Number(orderNum)).toFixed()
+          let totalSmall = (smallNum*Number(orderNum)).toFixed()
+          this.totalUseItem = {bigNum:totalBig,smallNum:totalSmall}
         }
       })
     }
@@ -212,8 +282,8 @@ export default {
         text-align: center;
     }
     & .active {
-      color: #1627be;
-      border-color: #1627be;
+      color: #3385FF;
+      border-color: #3385FF;
       font-size: 10upx;
       font-weight:bold;
     }

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

@@ -0,0 +1,192 @@
+<template>
+    <view class="boardset-flowert">
+        <view class="flower-input_box">
+            <view class="flower-title">{{customData.name}}</view>
+            <view class="flower-ratio" v-if="customData.property && customData.property==1">{{customData.ratio}}{{customData.smallName}}/{{customData.bigName}}</view>
+
+            <view class="flower-open_box">
+                <view @tap="checkCurrent(0)">
+                    <view class="desc" v-if="customData.property && customData.property==1">{{Number(unitType) == 0 ? customData.bigName : customData.smallName}}数</view>
+                    <view class="desc" v-else>数量</view>
+                    <div class="flower-unit_box">
+                        <text :class="{selected:checkType == 0}">{{currentNum}}</text>
+                    </div>
+                </view>
+            </view>
+
+            <view class="switch-button" v-if="customData.property && customData.property==1">
+                <image @tap="changeUnitType" class="change-unit" :src="`${constant.imgUrl}/icon/switch/switch128.png`"></image>
+            </view>
+
+        </view>
+        <view class="keyboard-body_box">
+         <VKeyboard ref="keyboard" :pointIsShow="true" :digital="true" :disorderly="false" @typing="typing" @enter="enter" @cancel="cancel"> </VKeyboard>
+        </view>
+    </view>
+</template>
+<script>
+import VKeyboard from '@/components/vKeyboard/VKeyboard.vue'
+export default {
+    name:'selectNum',
+    components:{ VKeyboard },
+    props:{
+        customData:{ type:Object, default:()=>{} }
+    },
+    data() {
+        return {
+            //输入类型 0 数值 1价格
+            fillType:0,
+            currentNum:'',
+            unitType:1,
+            unitName:'',
+            //全选类型 0 数值全选 1 价格全选 2 没有任何全选
+            checkType:0
+        };
+    },
+    mounted(){
+        this.activeKeyboard()
+    },
+	watch:{
+		customData:{
+			handler(newData){
+				this.currentNum = newData.currentNum ? parseFloat(newData.currentNum) : 1
+                this.unitName = newData.smallName
+			},
+			deep:true,
+            immediate:true
+		}
+	},
+    methods: {
+        checkCurrent(n){
+            this.checkType = n
+            this.fillType = n
+        },
+        cancel(){
+            this.$emit('cancelKdSelectNumPrice')
+        },
+        focus() {
+        },
+        focusSelect(event){
+            event.currentTarget.select();
+        },
+        activeKeyboard() {
+            this.$refs.keyboard.activate();
+        },
+        typing(e) {
+            if (e.backspace) {
+                if(this.fillType == 0){
+                    if(this.checkType == 0){
+                        this.currentNum = ''
+                     }else{
+                        if (this.currentNum.length > 0) {
+                            this.currentNum = this.currentNum.substring(0, this.currentNum.length - 1)   
+                        }
+                    }
+                }
+            }else {
+                if(this.fillType == 0){
+                    if(this.$util.isEmpty(this.currentNum) || this.checkType == 0) {
+                        this.currentNum = e.char
+                    }else {
+                        this.currentNum += e.char;
+                    }
+                }
+            }
+            this.checkType = 2
+        },
+        enter() {
+            if(Number(this.currentNum)  <= 0) {
+                this.$msg('请填写数量')
+                return
+            }
+            this.$emit('confirmWastageSelectNum', {currentNum:this.currentNum,unitType:this.unitType,unitName:this.unitName})
+            this.checkType = 0
+            this.fillType = 0
+        },
+        changeUnitType(){
+            this.unitType = this.unitType == 0 ? 1 : 0
+            this.unitName = this.unitType == 0 ? this.customData.bigName : this.customData.smallName
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.boardset-flowert {
+    width:34vw;
+    height: 80vh;
+    background-color: #ffffff;
+    margin: 0 auto;
+    border-radius: 5upx;
+    padding: 10upx;
+    overflow-y: auto;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    & .flower-input_box {
+        flex: 1;
+        & .flower-title {
+            text-align: center;
+            color: #333333;
+            font-size: 14upx;
+        }
+        & .flower-ratio{
+            text-align: center;
+            color: #CCCCCC;
+            font-size: 9upx;
+            margin-top:6upx;
+        }
+        & .set-residue_box {
+            font-size: 12upx;
+            color: #CCCCCC;
+            margin-top: 10upx;
+            text-align: center;
+        }
+    }
+    & .flower-open_box {
+        display: flex;
+        margin-top:10upx;
+        align-items: center;
+        justify-content: center;
+        & > view {
+            width:90upx;
+            & .desc {
+                text-align: center;
+                font-size: 13upx;
+                margin-bottom: 5upx;
+                color:#CCCCCC;
+            }
+            & .flower-unit_box {
+                display: flex;
+                font-size:15upx;
+                align-items: center;
+                justify-content:center;
+                border-bottom: 1px solid #eee;
+                & > text{
+                    height:25upx;
+                }
+                .selected{
+                    background:blue;
+                    color:white;
+                }
+            }
+        }
+    }
+    .switch-button{
+        display: flex;
+        justify-content: center;
+        width: 35upx;
+        height: 35upx;
+        position: absolute;
+        top:70upx;
+        left:23vw;
+        .change-unit {
+            width: 35upx;
+            height: 35upx;
+        }
+    }
+    & .keyboard-body_box {
+        flex: 1;
+        overflow: hidden;
+    }
+}
+</style>

hdPad/src/pages/home/make.vue

@@ -15,11 +15,16 @@
             <!-- 按钮操作 -->
             <view class="open-box">
 				<view class="button-area">
-					<view>制作</view>
-					<view @click="breakage">报损</view>
-					<view @click="clearItemFn">清空</view>
+					<view class="active" @click="commit()">提交</view>
+					<view class="active" @click="clearItemFn">清空</view>
 				</view>
             </view>
+
+			<!-- 完成工单弹框 -->
+			<uni-popup ref="finishWorkRef" background-color="#fff" type="right">
+				<finishWork @confirmCommit="confirmCommit" @cancelFinish="cancelFinish()"></finishWork>
+			</uni-popup>
+
         </view>
     </view>
 </template>
@@ -28,10 +33,12 @@ 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 productMins from "@/mixins/product"
+import { finish } from '@/api/work'
+import finishWork from './components/finishWork.vue'
 export default {
 	name: "make",
-	components: { rightItem,leftItem, casherNav},
+	components: { rightItem,leftItem, casherNav,finishWork},
 	mixins: [productMins],
 	data() {
 		return {
@@ -77,13 +84,20 @@ export default {
 		}
 	},
 	methods: {
-		logout(){
-
+		commit(){
+				this.$util.hitRemind()
+				this.$refs.finishWorkRef.open()
 		},
-		clearItemFn(){
-
+		confirmCommit(form){
+			this.$refs.finishWorkRef.close()
+			finish({...form,id:this.orderInfo.id}).then(res=>{
+				if(res.code == 1){
+				this.$msg(res.msg)
+				this.getOrderDetail(this.orderInfo.id)
+				}
+			})
 		},
-		breakage(){
+		clearItemFn(){
 
 		},
 		changeProperty(property){
@@ -133,11 +147,12 @@ export default {
 				margin-bottom: 10upx;
 				font-size: 10upx;
 				text-align: center;
-				&.active {
-					color: #008000;
-					border-color: #008000;
-					border-radius: 2upx;
-				}
+			}
+			& .active {
+				color: #3385FF;
+				border-color: #3385FF;
+				font-size: 10upx;
+				font-weight:bold;
 			}
 		}
 	}

hdPad/src/pages/home/modify.vue

@@ -14,9 +14,9 @@
             <view class="open-box">
 
 				<view class="button-area">
-					<view @click="clearItemFn">清空</view>
-					<view @click="cancel">取消</view>
-					<view @click="confirmModify">确认</view>
+					<view class="active" @click="clearItemFn">清空</view>
+					<view class="active" @click="cancel">取消</view>
+					<view class="active" @click="confirmModify">确认</view>
 				</view>
 
             </view>
@@ -34,8 +34,9 @@
 import { mapGetters } from "vuex";
 import rightItem from './components/rightItem.vue'
 import leftArea from './components/leftArea.vue'
-import productMins from "@/mixins/product";
+import productMins from "@/mixins/product"
 import { getFullInfo } from '@/api/work'
+import {modifyItem} from '@/api/work-item'
 export default {
 	name: "modify",
 	components: { rightItem,leftArea},
@@ -69,8 +70,23 @@ export default {
 		},
 		confirmModify(){
 			this.$util.hitRemind()
-			
-			uni.navigateBack({delta: 1})
+			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.num}
+			})
+			uni.showLoading({mask:true})
+			modifyItem({product:JSON.stringify(product),id:this.option.id}).then(res=>{
+				uni.hideLoading()
+				if(res.code == 1){
+					this.$msg('修改成功')
+					setTimeout(function(){
+						uni.navigateBack({delta: 1})
+					},1500)
+				}
+			})
 		},
 		getOrderDetail(id){
 			getFullInfo({id}).then(res=>{
@@ -124,11 +140,12 @@ export default {
 				margin-bottom: 10upx;
 				font-size: 10upx;
 				text-align: center;
-				&.active {
-					color: #008000;
-					border-color: #008000;
-					border-radius: 2upx;
-				}
+			}
+			& .active {
+				color: #3385FF;
+				border-color: #3385FF;
+				font-size: 10upx;
+				font-weight:bold;
 			}
 		}
 	}

hdPad/src/pages/home/selectMake.vue

@@ -15,8 +15,8 @@
             <!-- 按钮操作 -->
             <view class="open-box">
 				<view class="button-area">
-					<view>制作</view>
-					<view @click="clearItemFn">清空</view>
+					<view class="active">提交</view>
+					<view class="active" @click="clearItemFn">清空</view>
 				</view>
             </view>
         </view>
@@ -131,11 +131,12 @@ export default {
 				margin-bottom: 10upx;
 				font-size: 10upx;
 				text-align: center;
-				&.active {
-					color: #008000;
-					border-color: #008000;
-					border-radius: 2upx;
-				}
+			}
+			& .active {
+				color: #3385FF;
+				border-color: #3385FF;
+				font-size: 10upx;
+				font-weight:bold;
 			}
 		}
 	}