添加图片

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" afterPath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -25,11 +25,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="532">
-              <caret line="768" column="29" lean-forward="true" selection-start-line="768" selection-start-column="29" selection-end-line="768" selection-end-column="29" />
+            <state relative-caret-position="275">
+              <caret line="764" column="9" lean-forward="false" selection-start-line="764" selection-start-column="9" selection-end-line="764" selection-end-column="9" />
               <folding>
                 <element signature="e#345#694#0#PHP" expanded="false" />
                 <element signature="e#699#1464#0#PHP" expanded="false" />
@@ -70,10 +70,53 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="375">
+              <caret line="68" column="53" lean-forward="false" selection-start-line="68" selection-start-column="53" selection-end-line="68" selection-end-column="53" />
+              <folding>
+                <element signature="e#411#604#0#PHP" expanded="false" />
+                <element signature="e#609#825#0#PHP" expanded="false" />
+                <element signature="e#2079#2297#0#PHP" expanded="false" />
+                <element signature="e#2302#2510#0#PHP" expanded="false" />
+                <element signature="e#2516#2992#0#PHP" expanded="false" />
+                <element signature="e#2997#3515#0#PHP" expanded="false" />
+                <element signature="e#3521#4033#0#PHP" expanded="false" />
+                <element signature="e#4038#4601#0#PHP" expanded="false" />
+                <element signature="e#4607#5104#0#PHP" expanded="false" />
+                <element signature="e#5109#5949#0#PHP" expanded="false" />
+                <element signature="e#5955#6273#0#PHP" expanded="false" />
+                <element signature="e#6278#6654#0#PHP" expanded="false" />
+                <element signature="e#6660#7015#0#PHP" expanded="false" />
+                <element signature="e#7020#7429#0#PHP" expanded="false" />
+                <element signature="e#7435#7820#0#PHP" expanded="false" />
+                <element signature="e#7825#8496#0#PHP" expanded="false" />
+                <element signature="e#8502#8948#0#PHP" expanded="false" />
+                <element signature="e#8953#9804#0#PHP" expanded="false" />
+                <element signature="e#9810#10080#0#PHP" expanded="false" />
+                <element signature="e#10085#10561#0#PHP" expanded="false" />
+                <element signature="e#10567#11127#0#PHP" expanded="false" />
+                <element signature="e#11132#11959#0#PHP" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ShopgoodsModel.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="381">
+              <caret line="30" column="9" lean-forward="true" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="RestBaseController.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
+            <state relative-caret-position="1975">
               <caret line="93" column="57" lean-forward="false" selection-start-line="93" selection-start-column="57" selection-end-line="93" selection-end-column="57" />
               <folding />
             </state>
@@ -83,8 +126,8 @@
       <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="532">
-              <caret line="136" column="0" lean-forward="true" selection-start-line="136" selection-start-column="0" selection-end-line="136" selection-end-column="0" />
+            <state relative-caret-position="625">
+              <caret line="136" column="0" lean-forward="false" selection-start-line="136" selection-start-column="0" selection-end-line="136" selection-end-column="0" />
               <folding>
                 <element signature="e#305#577#0#PHP" expanded="false" />
                 <element signature="e#583#854#0#PHP" expanded="false" />
@@ -130,7 +173,6 @@
         <option value="$PROJECT_DIR$/api/index/model/ShoptypeModel.php" />
         <option value="$PROJECT_DIR$/api/index/model/ShoppicModel.php" />
         <option value="$PROJECT_DIR$/app/admin/controller/BuildController.php" />
-        <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
         <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/index.html" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/add.html" />
@@ -171,6 +213,7 @@
         <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
         <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
         <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
+        <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
       </list>
     </option>
   </component>
@@ -188,9 +231,9 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds">
-    <option name="x" value="891" />
-    <option name="y" value="7" />
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="96" />
+    <option name="y" value="116" />
     <option name="width" value="1582" />
     <option name="height" value="969" />
   </component>
@@ -209,6 +252,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -238,8 +283,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -331,18 +374,19 @@
       <workItem from="1574986868818" duration="22318000" />
       <workItem from="1575016153150" duration="3315000" />
       <workItem from="1575246616478" duration="21722000" />
-      <workItem from="1575278769037" duration="7368000" />
+      <workItem from="1575278769037" duration="7395000" />
+      <workItem from="1575332430854" duration="1871000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="410431000" />
+    <option name="totallyTimeSpent" value="412329000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="891" y="7" width="1582" height="969" extended-state="0" />
+    <frame x="96" y="116" width="1582" height="969" extended-state="1" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19250986" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19513798" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -477,13 +521,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/api/index/model/HomeModel.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="693">
@@ -547,13 +584,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="618">
-          <caret line="204" column="5" lean-forward="false" selection-start-line="204" selection-start-column="5" selection-end-line="204" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
@@ -572,7 +602,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -601,16 +630,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
-          <folding>
-            <element signature="e#264#877#0#PHP" expanded="false" />
-            <element signature="e#891#1678#0#PHP" expanded="false" />
-            <element signature="e#1692#2973#0#PHP" expanded="false" />
-            <element signature="e#2987#3712#0#PHP" expanded="false" />
-            <element signature="e#3731#4694#0#PHP" expanded="false" />
-            <element signature="e#4711#5355#0#PHP" expanded="false" />
-            <element signature="e#5372#6399#0#PHP" expanded="false" />
-            <element signature="e#6416#7236#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -688,7 +707,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -733,14 +751,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="200">
           <caret line="51" column="12" lean-forward="false" selection-start-line="51" selection-start-column="12" selection-end-line="54" selection-end-column="15" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="532">
-          <caret line="136" column="0" lean-forward="true" selection-start-line="136" selection-start-column="0" selection-end-line="136" selection-end-column="0" />
+        <state relative-caret-position="625">
+          <caret line="136" column="0" lean-forward="false" selection-start-line="136" selection-start-column="0" selection-end-line="136" selection-end-column="0" />
           <folding>
             <element signature="e#305#577#0#PHP" expanded="false" />
             <element signature="e#583#854#0#PHP" expanded="false" />
@@ -757,7 +774,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
+        <state relative-caret-position="1975">
           <caret line="93" column="57" lean-forward="false" selection-start-line="93" selection-start-column="57" selection-end-line="93" selection-end-column="57" />
           <folding />
         </state>
@@ -765,8 +782,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="532">
-          <caret line="768" column="29" lean-forward="true" selection-start-line="768" selection-start-column="29" selection-end-line="768" selection-end-column="29" />
+        <state relative-caret-position="275">
+          <caret line="764" column="9" lean-forward="false" selection-start-line="764" selection-start-column="9" selection-end-line="764" selection-end-column="9" />
           <folding>
             <element signature="e#345#694#0#PHP" expanded="false" />
             <element signature="e#699#1464#0#PHP" expanded="false" />
@@ -806,5 +823,44 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="68" column="53" lean-forward="false" selection-start-line="68" selection-start-column="53" selection-end-line="68" selection-end-column="53" />
+          <folding>
+            <element signature="e#411#604#0#PHP" expanded="false" />
+            <element signature="e#609#825#0#PHP" expanded="false" />
+            <element signature="e#2079#2297#0#PHP" expanded="false" />
+            <element signature="e#2302#2510#0#PHP" expanded="false" />
+            <element signature="e#2516#2992#0#PHP" expanded="false" />
+            <element signature="e#2997#3515#0#PHP" expanded="false" />
+            <element signature="e#3521#4033#0#PHP" expanded="false" />
+            <element signature="e#4038#4601#0#PHP" expanded="false" />
+            <element signature="e#4607#5104#0#PHP" expanded="false" />
+            <element signature="e#5109#5949#0#PHP" expanded="false" />
+            <element signature="e#5955#6273#0#PHP" expanded="false" />
+            <element signature="e#6278#6654#0#PHP" expanded="false" />
+            <element signature="e#6660#7015#0#PHP" expanded="false" />
+            <element signature="e#7020#7429#0#PHP" expanded="false" />
+            <element signature="e#7435#7820#0#PHP" expanded="false" />
+            <element signature="e#7825#8496#0#PHP" expanded="false" />
+            <element signature="e#8502#8948#0#PHP" expanded="false" />
+            <element signature="e#8953#9804#0#PHP" expanded="false" />
+            <element signature="e#9810#10080#0#PHP" expanded="false" />
+            <element signature="e#10085#10561#0#PHP" expanded="false" />
+            <element signature="e#10567#11127#0#PHP" expanded="false" />
+            <element signature="e#11132#11959#0#PHP" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="381">
+          <caret line="30" column="9" lean-forward="true" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file

@@ -34,7 +34,7 @@ class ShopgoodsModel extends Model
     public function selectData($where,$page,$pageNum){
         $data = $this
             ->where($where)
-            ->field('id,shoptype_id,goods_name,price')
+            ->field('id,shoptype_id,thumbnail,goods_name,price')
             ->order('id desc')
             ->page($page,$pageNum)
             ->select();