Merge remote-tracking branch 'origin/yuenan' into yuenan

addons/unishop/controller/Product.php

@@ -42,15 +42,15 @@ class Product extends Base
             $data->save();
 
             //服务
-            $server = explode(',', $data->server);
-            $configServer = json_decode(Config::getByName('server')['value'],true);
-            $serverValue = [];
-            foreach ($server as $k => $v) {
-                if (isset($configServer[$v])) {
-                    $serverValue[] = $configServer[$v];
-                }
-            }
-            $data->server = count($serverValue) ? implode(' · ', $serverValue) : '';
+//            $server = explode(',', $data->server);
+//            $configServer = json_decode(Config::getByName('server')['value'],true);
+//            $serverValue = [];
+//            foreach ($server as $k => $v) {
+//                if (isset($configServer[$v])) {
+//                    $serverValue[] = $configServer[$v];
+//                }
+//            }
+//            $data->server = count($serverValue) ? implode(' · ', $serverValue) : '';
 
             // 默认没有收藏
             $data->favorite = false;

application/admin/controller/Qa.php

@@ -30,6 +30,38 @@ class Qa extends Backend
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
-    
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            $total = $this->model
+                ->where($where)
+                ->order($sort, $order)
+                ->count();
+
+            $list = $this->model
+                ->join("ww_unishop_product","ww_unishop_product.id=ww_qa.product_id")
+                ->field("ww_qa.id,ww_qa.question,ww_qa.answer,ww_unishop_product.title")
+                ->where($where)
+                ->order($sort, $order)
+                ->limit($offset, $limit)
+                ->select();
+
+            $list = collection($list)->toArray();
+            $result = array("total" => $total, "rows" => $list);
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
 
 }

application/admin/view/qa/add.html

@@ -1,5 +1,10 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('商品')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-product_id" data-rule="required" data-field="title" data-source="unishop/product/index" class="form-control selectpage" name="row[product_id]" type="text" value="">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Question')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/qa/edit.html

@@ -1,6 +1,12 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('商品')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-product_id" data-rule="required" data-field="title" data-source="unishop/product/index" class="form-control selectpage" name="row[product_id]" type="text" value="{$row.product_id}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Question')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-question" data-rule="required" class="form-control" name="row[question]" type="text" value="{$row.question|htmlentities}">

application/database.php

@@ -16,13 +16,13 @@ return [
     // 数据库类型
     'type'            => Env::get('database.type', 'mysql'),
     // 服务器地址
-    'hostname'        => Env::get('database.hostname', '47.101.187.29'),
+    'hostname'        => Env::get('database.hostname', '43.129.92.193'),
     // 数据库名
     'database'        => Env::get('database.database', 'vietnam'),
     // 用户名
     'username'        => Env::get('database.username', 'root'),
     // 密码
-    'password'        => Env::get('database.password', 'zBg%V91jGrJPbvf5'),
+    'password'        => Env::get('database.password', 'Kjs98dt!SHA89'),
     // 端口
     'hostport'        => Env::get('database.hostport', ''),
     // 连接dsn

public/assets/js/backend/qa.js

@@ -25,6 +25,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'title', title: __('商品')},
                         {field: 'question', title: __('Question')},
                         {field: 'answer', title: __('Answer')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}