合并分支

src/views/base/config/settle/index.vue

@@ -125,6 +125,30 @@
           </div>
         </el-card>
       </el-col>
+      <el-col :span="12">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>隐私协议</span>
+          </div>
+          <div>
+            <vab-quill
+              ref="vab-quill"
+              v-model="form.joininPrivacyAgreement"
+              :min-height="400"
+              :options="options"
+            />
+          </div>
+          <div>
+            <el-button
+              icon="el-icon-s-tools"
+              type="primary"
+              @click="handleEdit('joininPrivacyAgreement')"
+            >
+              {{ __('修改') }}
+            </el-button>
+          </div>
+        </el-card>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -145,6 +169,7 @@
           joinin_condition: '',
           joinin_cooperation_details: '',
           joinin_expenses_details: '',
+          joininPrivacyAgreement:''
         },
 
         options: {
@@ -182,17 +207,20 @@
       __,
       async fetchData() {
         const { data } = await getList()
+        
         this.form = {
           joinin_investment_direction: data.joinin_investment_direction,
           joinin_standard: data.joinin_standard,
           joinin_condition: data.joinin_condition,
           joinin_cooperation_details: data.joinin_cooperation_details,
           joinin_expenses_details: data.joinin_expenses_details,
+          joininPrivacyAgreement : data.joininPrivacyAgreement
         }
       },
       async handleEdit(key) {
         const obj = {}
         obj[key] = this.form[key]
+      
         const { msg, status } = await doEdit({
           param: JSON.stringify(obj),
         })

src/views/index/index.vue

@@ -1114,7 +1114,9 @@ export default {
       if (data != null) {
         this.pram = data
         // 代发货
+
         this.data.wait_shipping_num = data.order.wait_shipping_num
+        
         // 待审核退货
         this.data.review_num = data.return.review_num
         // 违规商品