1

.idea/workspace.xml

@@ -3,8 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Qc.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Qc.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/service/UserSynth.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/service/UserSynth.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/LevelOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/LevelOrder.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/dist/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/dist/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -392,7 +393,8 @@
       <workItem from="1691110816556" duration="15531000" />
       <workItem from="1691370689465" duration="18334000" />
       <workItem from="1691456758629" duration="20606000" />
-      <workItem from="1691543042280" duration="17959000" />
+      <workItem from="1691543042280" duration="23354000" />
+      <workItem from="1691629430810" duration="321000" />
     </task>
     <servers />
   </component>
@@ -526,18 +528,18 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1691568282552" />
-    <state x="420" y="147" width="1942" height="1088" key="DiffContextDialog" timestamp="1690615446290">
+    <state x="420" y="147" width="1942" height="1088" key="DiffContextDialog" timestamp="1691629752755">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="420" y="147" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1690615446290" />
+    <state x="420" y="147" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1691629752755" />
     <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1690514130290">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1690514130290" />
-    <state x="535" y="293" key="com.intellij.ide.util.TipDialog" timestamp="1691456823132">
+    <state x="535" y="293" key="com.intellij.ide.util.TipDialog" timestamp="1691629469530">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="535" y="293" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1691456823132" />
+    <state x="535" y="293" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1691629469530" />
     <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1687246001889">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -554,10 +556,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1291" y="317" key="run.anything.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1686300134364" />
-    <state x="1581" y="565" width="672" height="678" key="search.everywhere.popup" timestamp="1690336708263">
+    <state x="1581" y="565" width="672" height="678" key="search.everywhere.popup" timestamp="1691569433958">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1581" y="565" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1690336708263" />
+    <state x="1581" y="565" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1691569433958" />
     <state x="1115" y="647" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1683770722863">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/api/controller/LevelOrder.php

@@ -315,6 +315,35 @@ class LevelOrder extends Base
         $this->transReturn($ret_data);
     }
 
+    /**
+     * @title 获取订单列表
+     * @desc 获取订单列表
+     * @author qc
+     * @method GET
+     * @url /api/Level_order/getOrderList
+     * @header name:Authorization require:1 desc:Token
+     * @param name:page type:int default:1 desc:页数
+     * @param name:page_num type:int default:20 desc:每页数
+     * @return name:order_no type:string default:--  desc:订单号
+     * @return name:price_total type:float default:--  desc:待支付金额
+     * @return name:level_id type:float default:--  desc:等级id
+     * @return name:level_name type:float default:--  desc:等级名称
+     * @return name:month type:float default:--  desc:时长（月）
+     * @return name:pay_state type:int default:--  desc:支付状态（0未支付1已支付）
+     * @return name:pay_type type:int default:--  desc:支付方式（1.h5微信,2.h5支付宝,3.app微信，4.app支付宝，5.h5微信内支付）
+     */
+    public function getOrderList()
+    {
+        $field = 'id,level_id,level_key,month,price_total,pay_type,order_no,create_at';
+        $list = \app\common\model\LevelOrder::field($field)->where(['user_id'=>$this->user_id,'pay_state'=>1])
+            ->order('id desc ')->limit($this->off_set,$this->page_num)->select()->toArray();
+        array_walk($list,function (&$v){
+
+        });
+        $total_num = \app\common\model\LevelOrder::field($field)->where(['user_id'=>$this->user_id,'pay_state'=>1])->count();
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num),'total_count'=>$total_num,'page_num'=>$this->page_num]);
+    }
+
 
 
 }

application/operate/view/supplier_goods/form.html

@@ -240,13 +240,13 @@
                         </label>
                     </div>
 
-                   <!-- <div class="layui-form-item layui-row layui-col-space15">
+                    <div class="layui-form-item layui-row layui-col-space15">
                         <label class="layui-col-xs9 relative">
                             <span class="color-green">产品详情</span>
                             <textarea name="content">{$vo.content|default=""}</textarea>
                         </label>
                     </div>
--->
+
 
                     <div class="layui-form-item text-center">
                         {notempty name='vo.id'}<input type="hidden" name="id" value="{$vo.id}">{/notempty}

public/dist/css/chunk-1d574e4e.29439bab.css

@@ -0,0 +1 @@
+.rich-text[data-v-a5f4b7a4]{background:#fff!important}.wrap[data-v-1a45626e]{width:100%}

public/dist/css/chunk-265bc009.d38ccc3a.css

@@ -0,0 +1 @@
+.home_wrap[data-v-29ae3009]{width:100%;height:100%}.home_wrap .pdf_down[data-v-29ae3009]{position:fixed;display:flex;z-index:20;right:.693333rem;bottom:7%}.home_wrap .pdf_down .pdf_set_left[data-v-29ae3009],.home_wrap .pdf_down .pdf_set_middle[data-v-29ae3009]{width:.8rem;height:1.066667rem;color:#408fff;font-size:.293333rem;padding-top:.666667rem;text-align:center;margin-right:.133333rem;cursor:pointer}html[data-v-29ae3009]{background:#ccc}canvas[data-v-29ae3009]{border-radius:.266667rem}

public/dist/css/chunk-336deebc.1040d1f0.css

@@ -0,0 +1 @@
+.wrap[data-v-1257b748]{width:100%;display:flex;flex-direction:column;align-items:center;padding:1.173333rem .4rem .4rem;box-sizing:border-box}.header[data-v-1257b748]{width:100%;height:1.173333rem;display:flex;justify-content:center;align-items:center;position:fixed;top:0;left:0;background-color:#fff;z-index:999}.return-img[data-v-1257b748]{position:absolute;left:.4rem;top:50%;transform:translateY(-50%);width:.533333rem}.header-title[data-v-1257b748]{color:#333;font-size:.48rem;font-weight:700}.icon[data-v-1257b748]{width:1.28rem;margin:1.066667rem 0 .4rem}.font-1[data-v-1257b748]{color:#2a63f3;font-size:.48rem;font-weight:700;margin-bottom:1.2rem}.font-2[data-v-1257b748]{color:#222;font-size:.373333rem;margin-bottom:.186667rem}.font-3[data-v-1257b748]{color:#999;font-size:.373333rem}.btn[data-v-1257b748]{color:#2a63f3;font-size:.373333rem;margin-left:.08rem}.btn-2[data-v-1257b748]{color:#fff;font-size:.48rem;font-weight:700;background-color:#2a63f3;border-radius:2.666667rem;width:3.6rem;height:1.173333rem;display:flex;justify-content:center;align-items:center;margin-top:2.053333rem}

public/dist/css/chunk-bd023f0c.53b9ea21.css

@@ -0,0 +1 @@
+.window[data-v-3193d512]{width:100%;display:flex;flex-direction:column;z-index:99999999;background-color:#fff;border-radius:.426667rem .426667rem 0 0}.window-top2[data-v-3193d512]{width:100%;white-space:nowrap;overflow:auto;padding:.853333rem .48rem .613333rem;box-sizing:border-box}.window-btn>img[data-v-3193d512]{width:.64rem;margin-right:.426667rem}.window-btn2[data-v-3193d512]{display:inline-block;color:#555;font-size:.266667rem;margin-right:.693333rem}.window-btn2>p>img[data-v-3193d512]{display:flex;flex-direction:column;align-items:center;height:1.44rem;margin-bottom:.266667rem}.window-btn-box2[data-v-3193d512]{width:100%;display:flex;justify-content:center;align-items:center;padding:.426667rem 0;box-sizing:border-box;background-color:#f4f4f4}.window-btn-box2>button[data-v-3193d512]{color:#555;font-size:.48rem;font-weight:400}