Merge branch 'spp' into 'master'

Spp

See merge request !41

src/views/my/admin_detail.vue

@@ -164,7 +164,7 @@
         <van-popup v-model="qxShow" close-icon="close">
           <div class="cancel_cont">
             <div class="pop_title">备注取消原因</div>
-            <textarea placeholder="请输入转单理由" v-model="reason" maxlength="100"></textarea>
+            <textarea placeholder="请输入取消原因" v-model="reason" maxlength="100"></textarea>
             <div class="btnItem flex-h">
               <div class="cancel" @click="cancel">取消</div>
               <div class="sure" @click="qx_submit">提交</div>

src/views/tabbar/admin_home.vue

@@ -246,7 +246,7 @@
     <van-popup v-model="qxShow" close-icon="close">
       <div class="cancel_cont">
         <div class="pop_title">备注取消原因</div>
-        <textarea placeholder="请输入转单理由" v-model="reason" maxlength="100"></textarea>
+        <textarea placeholder="请输入取消原因" v-model="reason" maxlength="100"></textarea>
         <div class="btnItem flex-h">
           <div class="cancel" @click="cancel">取消</div>
           <div class="sure" @click="qx_submit">提交</div>
@@ -526,6 +526,7 @@ export default {
                     .get(this.$myApi.GET_WORKER, curParams)
                     .then((data) => {
                         this.columns = data
+                        console.log(this.columns,'工人')
                         // var arr = []
                         //   for (let i in data) {
                         //     let options = {