合并分支 'liuzhen' 到 'master'

Liuzhen



查看合并请求 !27

@@ -62,6 +62,7 @@ class Config
                 'key'         => 'b6iGEk2ZPhj8ElHuWX0slbxojCVSn8oN',
                 'cert_path'   => ROOT_PATH.'/addons/wechat/cert/apiclient_cert.pem', // XXX: 绝对路径！！！！
                 'key_path'    => ROOT_PATH.'/addons/wechat/cert/apiclient_key.pem', // XXX: 绝对路径！！！！
+                'notify_url'  => '',
                 // 'device_info'     => '013467007045764',
                 // 'sub_app_id'      => '',
                 // 'sub_merchant_id' => '',

@@ -57,13 +57,13 @@ class Store extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $total = $this->model
-                    ->with(['admin','user','industry'])
+                    ->with(['admin','user'])
                     ->where($where)
                     ->order($sort, $order)
                     ->count();
 
             $list = $this->model
-                    ->with(['admin','user','industry'])
+                    ->with(['admin','user'])
                     ->where($where)
                     ->order($sort, $order)
                     ->limit($offset, $limit)
@@ -73,7 +73,6 @@ class Store extends Backend
                 
                 $row->getRelation('admin')->visible(['nickname']);
 				$row->getRelation('user')->visible(['nickname']);
-				$row->getRelation('industry')->visible(['name']);
             }
             $list = collection($list)->toArray();
             $result = array("total" => $total, "rows" => $list);

@@ -136,7 +136,7 @@ class Store extends Api
      * @ApiHeaders  (name=token, type=string, required=true, description="请求的Token")
      * @ApiParams   (name="store_name", type="string", required=true, description="店铺名称")
      * @ApiParams   (name="house_ids", type="string", sample="店铺1id,店铺2id", required=true, description="入驻社区")
-     * @ApiParams   (name="industry_id", type="string", required=true, description="行业/关键词id")
+     * @ApiParams   (name="industry_id", type="string", required=true, description="行业/关键词")
      * @ApiParams   (name="name", type="string", required=true, description="联系人姓名")
      * @ApiParams   (name="mobile", type="string", required=true, description="联系人手机号")
      * @ApiParams   (name="license", type="string", required=true, description="营业执照")
@@ -186,7 +186,7 @@ class Store extends Api
             $prepayId = $order_result->prepay_id;
             $pay_data = $payment->configForJSSDKPayment($prepayId);
         } else {
-            $this->error($order_result['return_msg'],$order_result);
+            $this->error($order_result['return_msg'],[$order_result,$order]);
         }
         Db::startTrans();
         $result = false;

@@ -7110,7 +7110,7 @@
                                                         <td>industry_id</td>
                                                         <td>string</td>
                                                         <td>是</td>
-                                                        <td>行业/关键词id</td>
+                                                        <td>行业/关键词</td>
                                                     </tr>
                                                                                                         <tr>
                                                         <td>name</td>
@@ -7169,7 +7169,7 @@
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="industry_id">industry_id</label>
-                                                            <input type="string" class="form-control input-sm" id="industry_id" required placeholder="行业/关键词id" name="industry_id">
+                                                            <input type="string" class="form-control input-sm" id="industry_id" required placeholder="行业/关键词" name="industry_id">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="name">name</label>
@@ -11547,7 +11547,7 @@
 
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2020-08-27 19:32:50                </div>
+                    Generated on 2020-08-27 19:23:30                </div>
                 <div class="col-md-6" align="right">
                     <a href="./" target="_blank">社区</a>
                 </div>

@@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'house_ids', title: __('House_ids')},
                         {field: 'user.nickname', title: __('User.nickname')},
                         {field: 'store_name', title: __('Store_name')},
-                        {field: 'industry.name', title: __('Industry.name')},
+                        {field: 'industry_id', title: __('Industry_id')},
                         {field: 'name', title: __('Name')},
                         {field: 'mobile', title: __('Mobile')},
                         {field: 'license', title: __('License'),operate: false,events:Table.api.events.image,formatter: Table.api.formatter.image},