Lawsun 1 рік тому
батько
коміт
ad561b8dcb

+ 32 - 31
.idea/workspace.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1.邀请分享红包调整;">
+    <list default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1.暂存;">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/controller/home/RelInviter.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/RelInviter.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/controller/home/user.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/user.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/service/commission.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/service/commission.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/controller/home/products.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/products.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/node_modules/egg-ts-helper/.tmp/eggInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/egg-ts-helper/.tmp/eggInfo.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -50,25 +48,27 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_MARK_IGNORED_FILES_AS_EXCLUDED&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/ysjjCode/shop-system&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.keymap&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;D:\\Program Files (x86)\\WebStorm 2022.2.1\\plugins\\JavaScriptLanguage\\jsLanguageServicesImpl\\external&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_MARK_IGNORED_FILES_AS_EXCLUDED": "true",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "last_opened_file_path": "D:/ysjjCode/shop-system",
+    "node.js.detected.package.eslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "preferences.keymap",
+    "ts.external.directory.path": "D:\\Program Files (x86)\\WebStorm 2022.2.1\\plugins\\JavaScriptLanguage\\jsLanguageServicesImpl\\external",
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;mysql&quot;
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "mysql"
     ]
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\ysjjCode\shop-system\app\service" />
@@ -250,14 +250,8 @@
       <workItem from="1688610318926" duration="5000" />
       <workItem from="1688610355850" duration="5828000" />
       <workItem from="1688949661834" duration="4497000" />
-      <workItem from="1689209473126" duration="3976000" />
-    </task>
-    <task id="LOCAL-00019" summary="1.wxJsAPIConfig对每个需要调用JS接口的URL签名加密;">
-      <created>1669820396354</created>
-      <option name="number" value="00019" />
-      <option name="presentableId" value="LOCAL-00019" />
-      <option name="project" value="LOCAL" />
-      <updated>1669820396354</updated>
+      <workItem from="1689209473126" duration="4787000" />
+      <workItem from="1689240225909" duration="648000" />
     </task>
     <task id="LOCAL-00020" summary="1.商品排序;">
       <created>1670322027650</created>
@@ -595,7 +589,14 @@
       <option name="project" value="LOCAL" />
       <updated>1688093049870</updated>
     </task>
-    <option name="localTasksCounter" value="68" />
+    <task id="LOCAL-00068" summary="1.暂存;">
+      <created>1689236035801</created>
+      <option name="number" value="00068" />
+      <option name="presentableId" value="LOCAL-00068" />
+      <option name="project" value="LOCAL" />
+      <updated>1689236035801</updated>
+    </task>
+    <option name="localTasksCounter" value="69" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -641,7 +642,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.删除定时任务:订单检查发放;" />
     <MESSAGE value="1.餐币钱包有效期90天;" />
     <MESSAGE value="1.餐币明细,客源信息;" />
     <MESSAGE value="1.餐币有效期;" />
@@ -666,7 +666,8 @@
     <MESSAGE value="1.git;" />
     <MESSAGE value="1...;" />
     <MESSAGE value="1.邀请分享红包调整;" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.邀请分享红包调整;" />
+    <MESSAGE value="1.暂存;" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.暂存;" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

+ 1 - 1
app/controller/home/products.js

@@ -89,7 +89,7 @@ module.exports = class ProductsController extends shopController {
       const seq = that.app.Sequelize;
       const result = await that.useModel.findAll({
         offset: 0, limit: 100,
-        where: { is_home: 1, product_stock: { [seq.Op.gt]: 1 }, is_sale: 1 },
+        where: { is_home: 1, product_stock: { [seq.Op.gte]: 1 }, is_sale: 1 },
         attributes: [ 'product_id', 'category_id', 'product_name', 'product_image', 'shop_price', 'market_price', 'is_new', 'is_hot' ],
         order: [[ 'is_hot', 'desc' ], [ 'is_new', 'desc' ], [ 'product_stock', 'desc' ], [ 'category_id', 'asc' ]],
       });

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
node_modules/egg-ts-helper/.tmp/eggInfo.json


Деякі файли не було показано, через те що забагато файлів було змінено