up

.env.development

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

.env.staging

@@ -4,5 +4,5 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = http://yybtest.ali251.langye.net/
+VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
 

src/views/order/component/actions.vue

@@ -21,7 +21,9 @@ export default {
       isShow:false,
       action:'',
       content:'',
-
+      operations:{},
+      operationsLen:false,
+      manuallyRefundFee:0,
       form:{
         follow:{
           content:'',
@@ -29,6 +31,7 @@ export default {
           product_id:"",
           merchant_name:"",
           product_name:"",
+          manually_refund_fee:''
         }
       }
     }
@@ -179,7 +182,28 @@ export default {
             <div>产品名称</div>
             <div>{this.content.vo?.order?.order_name}</div>
           </div>
-                <div class="action-form">
+          <div class="action-form" >
+{this.operationsLen?<div class="action-form-item" >
+                 <div class="action-form-label">本次分发已产生佣金</div>
+
+                 <div class="action-form-content">
+                   <el-input
+                     style={{'width':'380px'}}
+                     clearable
+                     size='small'
+              placeholder="请输入返佣金额"
+                     value={this.form.follow.manually_refund_fee}
+                     on={{
+                       ['input']:(e)=>{
+                         this.form.follow.manually_refund_fee = e
+                       }
+                     }}>
+
+    <template slot="append">推荐的返佣比{this.manually_refund_fee}%</template>
+                   </el-input>
+                 </div>
+           </div>:''}
+
              <div class="action-form-item">
                   <div class="action-form-label">内容</div>
 
@@ -224,7 +248,24 @@ export default {
       }).then(res => {
         this.content = res
         console.log(this.content)
-        this.isShow = true
+        this.isShow = true;
+        this.operations=res.operations;
+
+      if(JSON.stringify(this.operations)!="{}"&&this.operations.length!=0){
+        let manually_refund_fee=0;
+        let data=this.operations;
+        Object.keys(data).map((key,item)=>{
+                console.log(key,data[key]);//key=>属性名    data[key]=>属性=
+                manually_refund_fee=data[key]?.fee_ratio;
+        });
+        console.log("manually_refund_fee",(manually_refund_fee/100))
+        console.log("res.vo.current_assigned_fee",res.vo.current_assigned_fee)
+        this.form.follow.manually_refund_fee=(manually_refund_fee/100)*res.vo.current_assigned_fee;
+        this.manually_refund_fee=manually_refund_fee;
+        this.operationsLen=true;
+        }
+        else this.operationsLen=false;
+
       })
     },
     actionClick(){
@@ -245,6 +286,10 @@ export default {
             action:this.action,
             remark:this.form.follow.content
           }
+        if(this.operationsLen){
+          data.manually_refund_fee=this.form.follow.manually_refund_fee;
+        }
+        break;
       }
       itemAction(data).then(res => {
         console.log(res)

src/views/order/orderList.vue

@@ -297,7 +297,8 @@
                   row.order.member_address ? row.order.member_address : "修改服务地址"
                 } </div> )
               }
-            },
+            },
+            
             {
               label: "用户信息",
               Fprop: 'member',
@@ -379,8 +380,10 @@
               },
 
               {
-                prop: "order.remark",
+                prop: "order.member_comment",
-                label: "备注"
+                label: "备注",
+                align: "left",
+                minWidth: 320
               }
             ],
           }