up

.env.development

@@ -2,6 +2,7 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
+#VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
-#VUE_APP_BASE_DEV_API = https://yunyubang.ali251.langye.net/
+VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
-#VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
+VUE_APP_BASE_DEV_API = https://yunyubang.ali251.langye.net/
+

src/views/dashboard/components/PanelGroup.vue

@@ -73,7 +73,7 @@
            活动统计
          </div>
          <div class="bline"></div>
-         <div class="boxcontentsubtitle">当日下单/取消</div>
+         <div class="boxcontentsubtitle">当日报名/取消</div>
          <div class="boxcontent">
            <div class="boxcontentitem">
              <div class="boxcontentitem-big">
@@ -92,7 +92,7 @@
          </div>
          <div class="boxcline"></div>
 
-         <div class="boxcontentsubtitle">当前下单/取消</div>
+         <div class="boxcontentsubtitle">当前报名/取消</div>
          <div class="boxcontent">
            <div class="boxcontentitem">
              <div class="boxcontentitem-big">

src/views/order/component/actions.vue

@@ -105,7 +105,7 @@ export default {
           for (var m of data) {
             _data.push(
             {
-              value:m.name,
+              value:m.username,
               id:m.id
             }
             )

src/views/order/orderList.vue

@@ -133,7 +133,7 @@
         <el-table-column fixed="right" label="操作" width="320" header-align="center">
           <template slot-scope="scope">
             <!-- <actions :row="scope.row" @log="showLog(scope.row)" @refresh="getOrders"></actions> -->
-            <actions :row="scope.row" @log="showLog(scope.row)"></actions>
+            <actions :row="scope.row" @log="showLog(scope.row)" @refresh="getOrders"></actions>
             <!--            <Button icon="ios-chatbubbles-outline" type="primary" style="margin-left: 10px;margin-bottom: 6px;" size="small" ghost>跟进</Button>-->
             <!--            <Button v-show="scope.row.state_name == '待处理'" icon="ios-paper-plane-outline" type="primary" style="margin-left: 10px;margin-bottom: 6px;" size="small" ghost>分发</Button>-->
             <!--            <Button v-show="scope.row.state_name == '待处理'" icon="ios-close" type="primary" style="margin-left: 10px;margin-bottom: 6px;" size="small" ghost>取消</Button>-->
@@ -146,7 +146,7 @@
 
     <orderLog :id="selectId" :is-show.sync="isShowLog" @refresh="getOrders"></orderLog>
     <!-- <orderEdit :id="selectId" :is-show.sync="isShowEdit" @refresh="getOrders"></orderEdit> -->
-    <orderEdit :id="selectId" :is-show.sync="isShowEdit"></orderEdit>
+    <orderEdit :id="selectId" :is-show.sync="isShowEdit" @refresh="getOrders"></orderEdit>
 
   </div>
 </template>

src/views/reports/userView.vue

@@ -115,7 +115,10 @@
             label: '姓名',
             width: 180,
             sortable: false,
-            fixed: 'left'
+            fixed: 'left',
+            // customFn: (row) => {
+            //   return (<div>{row.name?row.name:(row.wechat_nickname?row.wechat_nickname:'')}</div> )
+            //   }
           },
           {
             prop: 'phone',