商户申请

王晓刚
.idea/workspace.xml
application/home/view/index/index.html
--- a/.idea/workspace.xml
查看文件 @fcb0f95
+++ b/.idea/workspace.xml
查看文件 @fcb0f95
@@ -5,6 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/home/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -45,8 +46,17 @@
       <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="15" column="26" selection-start-line="15" selection-start-column="26" selection-end-line="15" selection-end-column="26" />
+            <state relative-caret-position="527">
+              <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="57" selection-end-column="19" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="public.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="810">
+              <caret line="271" column="1" selection-start-line="271" selection-start-column="1" selection-end-line="271" selection-end-column="1" />
             </state>
           </provider>
         </entry>
@@ -136,7 +146,6 @@
         <option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" />
         <option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
         <option value="$PROJECT_DIR$/application/home/view/member/withdraw_information.html" />
-        <option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
         <option value="$PROJECT_DIR$/application/home/view/member/earnings_log.html" />
         <option value="$PROJECT_DIR$/application/home/view/member/withdraw_log.html" />
         <option value="$PROJECT_DIR$/application/home/view/merchant/enter.html" />
@@ -171,6 +180,7 @@
         <option value="$PROJECT_DIR$/application/home/model/Goods.php" />
         <option value="$PROJECT_DIR$/application/home/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
+        <option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
         <option value="$PROJECT_DIR$/application/home/view/index/index.html" />
       </list>
     </option>
@@ -376,28 +386,7 @@
       <workItem from="1573174620844" duration="32581000" />
       <workItem from="1573259331081" duration="30435000" />
       <workItem from="1573432217070" duration="2199000" />
-      <workItem from="1573519427130" duration="17295000" />
-    </task>
-    <task id="LOCAL-00559" summary="    商户申请">
-      <created>1573537094775</created>
-      <option name="number" value="00559" />
-      <option name="presentableId" value="LOCAL-00559" />
-      <option name="project" value="LOCAL" />
-      <updated>1573537094775</updated>
-    </task>
-    <task id="LOCAL-00560" summary="    商户申请">
-      <created>1573539445903</created>
-      <option name="number" value="00560" />
-      <option name="presentableId" value="LOCAL-00560" />
-      <option name="project" value="LOCAL" />
-      <updated>1573539445903</updated>
-    </task>
-    <task id="LOCAL-00561" summary="    商户申请">
-      <created>1573539749947</created>
-      <option name="number" value="00561" />
-      <option name="presentableId" value="LOCAL-00561" />
-      <option name="project" value="LOCAL" />
-      <updated>1573539749947</updated>
+      <workItem from="1573519427130" duration="17475000" />
     </task>
     <task id="LOCAL-00562" summary="    商户申请">
       <created>1573539953748</created>
@@ -721,11 +710,32 @@
       <option name="project" value="LOCAL" />
       <updated>1573563547057</updated>
     </task>
-    <option name="localTasksCounter" value="608" />
+    <task id="LOCAL-00608" summary="    商户申请">
+      <created>1573563645186</created>
+      <option name="number" value="00608" />
+      <option name="presentableId" value="LOCAL-00608" />
+      <option name="project" value="LOCAL" />
+      <updated>1573563645186</updated>
+    </task>
+    <task id="LOCAL-00609" summary="    商户申请">
+      <created>1573563687766</created>
+      <option name="number" value="00609" />
+      <option name="presentableId" value="LOCAL-00609" />
+      <option name="project" value="LOCAL" />
+      <updated>1573563687766</updated>
+    </task>
+    <task id="LOCAL-00610" summary="    商户申请">
+      <created>1573563728008</created>
+      <option name="number" value="00610" />
+      <option name="presentableId" value="LOCAL-00610" />
+      <option name="project" value="LOCAL" />
+      <updated>1573563728008</updated>
+    </task>
+    <option name="localTasksCounter" value="611" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="423602000" />
+    <option name="totallyTimeSpent" value="423782000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -833,13 +843,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="657">
-          <caret line="74" column="9" selection-start-line="74" selection-start-column="1" selection-end-line="74" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://D:/phpStudy/WWW/chengxiang/public/themes/simpleboot3/public/assets/assets/imgs/dfsdgffdgsga@2x.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -1114,10 +1117,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="810">
+          <caret line="271" column="1" selection-start-line="271" selection-start-column="1" selection-end-line="271" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="26" selection-start-line="15" selection-start-column="26" selection-end-line="15" selection-end-column="26" />
+        <state relative-caret-position="527">
+          <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="57" selection-end-column="19" />
         </state>
       </provider>
     </entry>
--- a/application/home/view/index/index.html
查看文件 @fcb0f95
+++ b/application/home/view/index/index.html
查看文件 @fcb0f95
@@ -29,31 +29,33 @@
     </div>
     <!-- 列表 -->
     <div class="content_list">
-        <!--<div id="dom">-->
-            <!--{foreach name="$data" item="vo"}-->
-            <!--<div class="content_single" onclick="detail('{$vo.id}')">-->
-                <!--<div class="single_title">{$vo.goods_name}</div>-->
-                <!--<div class="single_coupon">{$vo.exp}红包券</div>-->
-                <!--<div class="layout justify flex_row align_center">-->
-                    <!--<div class="single_date">截止日期： {$vo.end_time}</div>-->
-                    <!--<div class="single_btn">可参与</div>-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--{/foreach}-->
-        <!--</div>-->
+        <div id="dom">
+            {foreach name="$data" item="vo"}
+            <div class="content_single" onclick="detail('{$vo.id}')">
+                <div class="single_title">{$vo.goods_name}</div>
+                <div class="single_coupon">{$vo.exp}红包券</div>
+                <div class="layout justify flex_row align_center">
+                    <div class="single_date">截止日期： {$vo.end_time}</div>
+                    <div class="single_btn">可参与</div>
+                </div>
+            </div>
+            {/foreach}
+        </div>
+        {empty name="$data"}
             <div class="empty_data">
                 暂无数据
             </div>
-        <!--{notempty name="$data"}-->
-            <!--<div class="load_more layout align_center justify_center">-->
-                <!--<div>加载更多</div>-->
-                <!--<div class="layout align_center justify_center">-->
-                    <!--<img src="__CDN__/assets/advertising/img/right.png" alt="">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--&lt;!&ndash;当前页&ndash;&gt;-->
-            <!--<input type="hidden" id="page" value="1"/>-->
-        <!--{/notempty}-->
+        {/empty}
+        {notempty name="$data"}
+            <div class="load_more layout align_center justify_center">
+                <div>加载更多</div>
+                <div class="layout align_center justify_center">
+                    <img src="__CDN__/assets/advertising/img/right.png" alt="">
+                </div>
+            </div>
+            <!--当前页-->
+            <input type="hidden" id="page" value="1"/>
+        {/notempty}
     </div>
     {include file="public/nav"/}