Merge branch 'qs_local_order' into develop

app/Admin/Common/Rpc.php

@@ -47,6 +47,13 @@ class Rpc
         return $response->getBody()->getContents();
     }
 
+    /**
+     * @param $lng1
+     * @param $lat1
+     * @param $lng2
+     * @param $lat2
+     * @return mixed
+     */
     public static function getDistance($lng1, $lat1, $lng2, $lat2){
         $client = Client::factory(env('RPC_SITE_HOST'));
         $request = $client->request(

app/Admin/Extensions/OrderStateHandle.php

@@ -47,7 +47,6 @@ class OrderStateHandle extends RowAction
             return $this->response()->success('操作成功')->refresh();
         }elseif ($state==9){//同意退款
             $order = $orderMain::where('id',$id)->first();
-
             $result = json_decode(Rpc::orderRefund($order->global_order_id,$order->user_id),true)['result'];
             if (isset($result['code'])&&$result['code']!=0){
                 Log::error('订单退款接口调用失败',$result);

resources/views/orderdetail.php

@@ -54,7 +54,7 @@
                 <p style="float: right;" v-if="goods.status==3">{{refund_3}}</p>
             </div>
         </div>
-        <p v-if="item.note">店铺备注: ({{item.note}})</p>l
+        <p v-if="item.note">店铺备注: ({{item.note}})</p>
     </div>
     <div class="money">
         总金额: {{total_money}} 元
@@ -67,7 +67,7 @@
         &ensp;&ensp;
         实付金额: {{money}} 元
 
-    </div>l
+    </div>
     <el-dialog :title="refund_goods_name" :visible.sync="dialogFormVisible">
         <el-input :rows="5" v-model="total_refund_note" placehoder="请备注退款原因" type="textarea"></el-input>
         <div slot="footer" class="dialog-footer">