Browse Source

1、详情参数pid;

Lawsun 1 year ago
parent
commit
51f701882e

+ 41 - 23
.idea/workspace.xml

@@ -1,11 +1,11 @@
 <?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、活跃用户列表排除内部员工;">
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/7d802c84-b2d0-49d9-a044-ab91ef765055.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/7d802c84-b2d0-49d9-a044-ab91ef765055.xml" afterDir="false" />
+    <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/products.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/products.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/routers/home/shop.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/routers/home/shop.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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -276,21 +276,10 @@
       <workItem from="1693618204645" duration="54000" />
       <workItem from="1693965606793" duration="9192000" />
       <workItem from="1694742935995" duration="13888000" />
-      <workItem from="1695004502767" duration="17969000" />
-    </task>
-    <task id="LOCAL-00032" summary="1.修复下单付款没有扣除库存的问题;">
-      <created>1673230889699</created>
-      <option name="number" value="00032" />
-      <option name="presentableId" value="LOCAL-00032" />
-      <option name="project" value="LOCAL" />
-      <updated>1673230889699</updated>
-    </task>
-    <task id="LOCAL-00033" summary="1.微信商家转账到零钱(提现);">
-      <created>1675386255513</created>
-      <option name="number" value="00033" />
-      <option name="presentableId" value="LOCAL-00033" />
-      <option name="project" value="LOCAL" />
-      <updated>1675386255513</updated>
+      <workItem from="1695004502767" duration="28249000" />
+      <workItem from="1695286894959" duration="3992000" />
+      <workItem from="1695613237591" duration="1735000" />
+      <workItem from="1695632813472" duration="11585000" />
     </task>
     <task id="LOCAL-00034" summary="1.提现备注;">
       <created>1675387476970</created>
@@ -621,7 +610,21 @@
       <option name="project" value="LOCAL" />
       <updated>1694768534260</updated>
     </task>
-    <option name="localTasksCounter" value="81" />
+    <task id="LOCAL-00081" summary="1、新增办公家具首页接口;2、区分办公家用;">
+      <created>1695110880565</created>
+      <option name="number" value="00081" />
+      <option name="presentableId" value="LOCAL-00081" />
+      <option name="project" value="LOCAL" />
+      <updated>1695110880565</updated>
+    </task>
+    <task id="LOCAL-00082" summary="1、商品分类树区分办公家具和家用家具;">
+      <created>1695172747981</created>
+      <option name="number" value="00082" />
+      <option name="presentableId" value="LOCAL-00082" />
+      <option name="project" value="LOCAL" />
+      <updated>1695172747981</updated>
+    </task>
+    <option name="localTasksCounter" value="83" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -654,7 +657,7 @@
                   <entry key="branch">
                     <value>
                       <list>
-                        <option value="master" />
+                        <option value="origin/master" />
                       </list>
                     </value>
                   </entry>
@@ -665,10 +668,23 @@
         </entry>
       </map>
     </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="origin/master" />
+                </option>
+              </RecentGroup>
+            </list>
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.调整限制兑酒红包的使用;" />
-    <MESSAGE value="1.调整餐店分佣比例;" />
     <MESSAGE value="1.修复电子餐费发放失败的bug;" />
     <MESSAGE value="1.添加购物车数量调整;" />
     <MESSAGE value="1.限制餐厅指定微信号提现;2.补充餐店未结算合作费用款项字段;" />
@@ -692,7 +708,9 @@
     <MESSAGE value="1、热卖-新品-销量-库存 排序;" />
     <MESSAGE value="1、补充员工字段;" />
     <MESSAGE value="1、活跃用户列表排除内部员工;" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、活跃用户列表排除内部员工;" />
+    <MESSAGE value="1、新增办公家具首页接口;2、区分办公家用;" />
+    <MESSAGE value="1、商品分类树区分办公家具和家用家具;" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、商品分类树区分办公家具和家用家具;" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

+ 5 - 0
app/controller/home/RelInviter.js

@@ -15,6 +15,11 @@ module.exports = class RelInviterController extends Base {
     // const stateStr = that.app.szjcomo.base64_encode('http://test.enroll.sizhijie.com/#/shop/category?category_id=11');
     // const hh = that.app.szjcomo.base64_decode(stateStr);
 
+    const stateStr = that.app.szjcomo.base64_encode('http://ysjj.sizhijie.com/#/shop/officeHome');
+    console.log(stateStr);
+
+    // https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx7713e08a353ffcd7&redirect_uri=http%3A%2F%2Fysjj.sizhijie.com%2F%23%2Fshop%2Fwxauth&response_type=code&scope=snsapi_userinfo&state=aHR0cDovL3lzamouc2l6aGlqaWUuY29tLyMvc2hvcC9vZmZpY2VIb21l#wechat_redirect
+
     // 2023/2/21 获取当前待发的佣金总额
     const commissionResult = await that.getCurrentCommission();
 

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

@@ -178,6 +178,7 @@ module.exports = class ProductsController extends shopController {
         attributes: {
           include: [
             [ seq.col('categorys.category_name'), 'category_name' ],
+            [ seq.col('categorys.pid'), 'pid' ],
             [ seq.col('contents.desction'), 'product_content' ],
             [ seq.col('carousels.content'), 'product_carouse' ],
           ],

File diff suppressed because it is too large
+ 0 - 0
node_modules/egg-ts-helper/.tmp/eggInfo.json


Some files were not shown because too many files changed in this diff