零钱提现

src/views/purseManage/gainRecord.vue

@@ -52,13 +52,13 @@
 
         <el-table-column width="200" align="center" label="来源">
           <template scope="scope">
-            <span>{{scope.row.sourceName}}</span>
+            <span>{{scope.row.sourceUserName}}</span>
           </template>
         </el-table-column>
 
         <el-table-column width="200" align="center" label="订单号">
           <template scope="scope">
-            <span>{{scope.row.cono}}</span>
+            <span>{{scope.row.orderNo}}</span>
           </template>
         </el-table-column>
         <el-table-column width="200" align="center" label="订单金额">
@@ -68,7 +68,8 @@
         </el-table-column>
         <el-table-column width="200" align="center" label="提成比例">
           <template scope="scope">
-            <span>{{scope.row.extract}}%</span>
+            <span v-if="scope.row.extract">{{scope.row.extract}}%</span>
+            <span else></span>
           </template>
         </el-table-column>
         <el-table-column width="100" align="center" label="金额变动">

src/views/summit/model/summitPopup.vue

@@ -3,7 +3,7 @@
     <div>
       <el-form :model="form" ref="form" label-width="120px">
         <div>
-          <!-- <div><span><h3>基础信息</h3></span></div> -->
+          <p style="padding:20px 0;border-bottom:1px solid #d9d9d9">基础信息</p>
           <div class="steLine">
             <el-row>
               <el-col :span="12">
@@ -124,14 +124,37 @@
             </el-row>
           </div>
         </div>
-        <!-- <div>
-          <div><span><h3>报名页面</h3></span></div>
+        <div>
+          <p style="padding:20px 0;border-bottom:1px solid #d9d9d9">报名页面</p>
           <div>
             <el-row>
-              <el-col :span="10">
-                <el-form-item label="峰会简介:">
-                  <el-input class="fhjj" v-model="form.content" :rows="9" type="textarea"
-                            placeholder="请输入车型简介"></el-input>
+              <el-col>
+                <el-form-item label="峰会主题：">
+                  <UE
+                    :editorId="activeName"
+                    :defaultMsg="form.content"
+                    :config="config"
+                    ref="ue"
+                    @ready="editorReadyEvent"
+                  ></UE>
+                </el-form-item>
+                <el-form-item label="诚邀莅临：" prop="name">
+                  <UE
+                    :editorId="activeNameShare"
+                    :defaultMsg="form.share"
+                    :config="config"
+                    ref="ue"
+                    @ready="editorReadyEventShare"
+                  ></UE>
+                </el-form-item>
+                <el-form-item label="公司简章：" prop="name">
+                  <UE
+                    :editorId="activeNameFirm"
+                    :defaultMsg="form.contentFirm"
+                    :config="config"
+                    ref="ue"
+                    @ready="editorReadyEventFirm"
+                  ></UE>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -144,16 +167,19 @@
                         v-model="item.time"
                         type="datetime"
                         format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择时间">
-                      </el-date-picker>
+                        placeholder="请选择时间"
+                      ></el-date-picker>
                     </el-col>
                     <el-col :span="8">
                       <el-input class="content" v-model="item.content" placeholder="请输入内容"></el-input>
                     </el-col>
                     <el-col class="content" :span="8">
-                      <el-button type="danger" size="small" style="margin-left: 10px;" @click="deleteItem(item,index)">
-                        删除
-                      </el-button>
+                      <el-button
+                        type="danger"
+                        size="small"
+                        style="margin-left: 10px;"
+                        @click="deleteItem(item,index)"
+                      >删除</el-button>
                     </el-col>
                   </el-row>
                 </el-form-item>
@@ -165,7 +191,7 @@
               </el-form-item>
             </el-row>
           </div>
-        </div>-->
+        </div>
       </el-form>
     </div>
     <div slot="footer" class="dialog-footer1">
@@ -185,6 +211,7 @@ import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/fo
 import { getOne, update, add } from "src/api/summit/activity";
 import { getToken } from "src/utils/auth";
 import { mapGetters } from "vuex";
+import UE from "../../modal/Ueditor"; //百度ue富文本
 export default {
   props: ["popupShow", "popupRow", "titleNme"],
   name: "summitPopup",
@@ -192,15 +219,23 @@ export default {
     ElFormItem,
     ElCol,
     ElInput,
-    ElRow
+    ElRow,
+    UE
   },
   data() {
     return {
+      config: {
+        initialFrameWidth: null,
+        initialFrameHeight: 350
+      },
       dialogVisible: false,
       title: "",
       BASE_API: process.env.BASE_API,
       percent: 0, //上传进度
       imgFlag: false,
+      activeName: "first",
+      activeNameShare: "second",
+      activeNameFirm: "three",
       form: {
         title: undefined,
         banner: undefined,
@@ -211,10 +246,13 @@ export default {
         longitude: undefined,
         latitude: undefined,
         state: "默认",
-        rid: undefined
+        rid: undefined,
+        content: "",
+        share: "",
+        contentFirm: ""
       },
       result: false,
-      processJson: []
+      processJson: [{ time: undefined, content: "" }]
     };
   },
 
@@ -254,6 +292,30 @@ export default {
         this.dialogVisible = true;
       }
     },
+    editorReadyEvent(instance) {
+      let t = this;
+      instance.addListener("contentChange", () => {
+        if (t.activeName == "first") {
+          t.from.content = instance.getContent();
+        }
+      });
+    },
+    editorReadyEventShare(instance) {
+      let t = this;
+      instance.addListener("contentChange", () => {
+        if (t.activeNameShare == "second") {
+          t.from.share = instance.getContent();
+        }
+      });
+    },
+    editorReadyEventFirm(instance) {
+      let t = this;
+      instance.addListener("contentChange", () => {
+        if (t.activeNameFirm == "three") {
+          t.from.contentFirm = instance.getContent();
+        }
+      });
+    },
     /**
      * 封面图上传进度
      * */
@@ -420,14 +482,14 @@ export default {
   margin-bottom: 2%;
 }
 
-. el-form-item__content {
+/* . el-form-item__content {
   margin-left: 5% !important;
-}
+} */
 
 .status {
   margin-top: 4%;
 }
-.steLine .el-row{
+.steLine .el-row {
   margin-bottom: 10px;
 }
 </style>