店铺管理-账单统计

app.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "pages": [
     "pages/index/index",
     "pages/logs/logs",
@@ -17,21 +16,3 @@
   },
   "sitemapLocation": "sitemap.json"
 }
-=======
-  "pages":[
-    "pages/index/index",
-    "pages/logs/logs"
-  ],
-  "window":{
-    "backgroundTextStyle":"light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "Weixin",
-    "navigationBarTextStyle":"black"
-  },
-  "usingComponents": {
-    "van-button":"@vant/weapp/button"
-  },
-
-  "sitemapLocation": "sitemap.json"
-}
->>>>>>> 2e65b556490cfe24940c679f526c85a7b019b6c7

pages/index/index.wxml

@@ -10,9 +10,7 @@
     <block wx:elif="{{!hasUserInfo}}">
       <button wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile"> 获取头像昵称 </button>
       <button wx:elif="{{canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button>
-      
-
-      <view wx:else> 请使用1.4.4及以上版本基础库 </view>
+            <view wx:else> 请使用1.4.4及以上版本基础库 </view>
     </block>
     <block wx:else>
       <image bindtap="bindViewTap" class="userinfo-avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
@@ -24,9 +22,4 @@
   </view>
   <van-button type="primary">按钮</van-button>
 </view>
-<<<<<<< HEAD
-<!-- 两端对齐 -->
-
-
-=======
->>>>>>> 2e65b556490cfe24940c679f526c85a7b019b6c7
+<!-- 两端对齐 -->

project.private.config.json

@@ -1,61 +1,41 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-<<<<<<< HEAD
-  "projectname": "delivery-rider",
+  "projectname": "delivery-business",
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "2.19.6",
   "condition": {
     "miniprogram": {
       "list": [
         {
           "name": "",
-          "pathName": "pages/index/index",
+          "pathName": "pages/billing_Statistics/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/billing_Statistics/index",
           "query": "",
           "launchMode": "default",
-          "scene": null,
-          "partialCompile": {
-            "enabled": false,
-            "pages": [
-              "pages/billing_Statistics/index"
-            ]
-          }
+          "scene": null
         },
         {
           "name": "账单统计",
           "pathName": "pages/billing_Statistics/index",
           "query": "",
           "launchMode": "default",
-          "scene": null,
-          "partialCompile": {
-            "enabled": false,
-            "pages": [
-              "pages/billing_Statistics/index"
-            ]
-          }
+          "scene": null
         },
         {
           "name": "店铺管理",
           "pathName": "pages/store_Management/index",
           "query": "",
           "launchMode": "default",
-          "scene": null,
-          "partialCompile": {
-            "enabled": false,
-            "pages": [
-              "pages/store_Management/index"
-            ]
-          }
+          "scene": null
         }
       ]
     }
   }
-=======
-  "projectname": "miniprogram",
-  "setting": {
-    "compileHotReLoad": true
-  },
-  "libVersion": "2.19.6"
->>>>>>> 2e65b556490cfe24940c679f526c85a7b019b6c7
 }