修改bug

packages/merchant/src/core/libs/requests.ts

@@ -80,7 +80,7 @@ export const getVendorAppInfo = () =>
  * 商家端-获取商家订单
  */
 export const getOrders = (query: {}) =>
-  httpPost<
+  httpGet<
     ResPageData<{
       id: number
       orderType: number

packages/merchant/src/manifest.json

@@ -87,14 +87,7 @@
     "setting": {
       "urlCheck": false
     },
-    "usingComponents": true,
-    "requiredPrivateInfos": [
-      "getLocation", "chooseLocation"
-    ],
-    "permission": {
-      "scope.userLocation": {
-        "desc": "你的位置信息将用于小程序位置接口的效果展示"
-    }
+    "usingComponents": true
   },
   "mp-alipay": {
     "usingComponents": true,

packages/merchant/src/pages.json

@@ -70,7 +70,11 @@
     },
     {
       "path": "pages/login/forget",
-      "type": "page"
+      "type": "page",
+      "style": {
+        "navigationBarTitleText": "修改密码",
+        "navigationBarBackgroundColor": "#fff"
+      }
     },
     {
       "path": "pages/mine/index",
@@ -202,14 +206,6 @@
       }
     },
     {
-      "path": "pages/login/forget",
-      "type": "page",
-      "style": {
-        "navigationBarTitleText": "修改密码",
-        "navigationBarBackgroundColor": "#fff"
-      }
-    },
-    {
       "path": "pages/common/orders/detail/index",
       "type": "page",
       "style": {
@@ -284,4 +280,4 @@
     }
   ],
   "subPackages": []
-}
+}

packages/merchant/src/pages/agent/designer/index.vue

@@ -348,7 +348,7 @@ onLoad(async (params: { title?: string; filter?: string; tags?: string }) => {
                         <div
                           class="text-black/30 text-xs font-normal font-['PingFang_SC'] leading-none"
                         >
-                          {{ it.accessTime ? `${beforeNow(new Date(it.accessTime))}访问` : '' }}
+                          {{ it.accessTime ? `${beforeNow(new Date(it.accessTime))}跟进` : '' }}
                         </div>
                         <div class="bg-[#eeeeee] w-[2px] h-[10px]"></div>
                         <div

packages/merchant/src/pages/agent/tasks/detail/index.vue

@@ -67,7 +67,7 @@ const submitTask = async () => {
         taskId: taskId.value,
         ...formData.value,
       }),
-    { success: true, successTitle: '上报成功' },
+    { success: true, successTitle: '报备成功' },
   )
   uni.hideLoading()
   await setTaskDetails()

packages/merchant/src/pages/home/merchant/add-reporting-information.vue

@@ -121,7 +121,7 @@ const SubmitClick = async () => {
     if (code === 0) {
       uni
         .showToast({
-          title: '上报成功',
+          title: '报备成功',
           icon: 'none',
         })
         .then(() => {

packages/merchant/src/pages/mine/index.vue

@@ -262,9 +262,13 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
             </template>
           </wd-radio-group>
           <SectionHeading></SectionHeading>
-          <div class="mt-[20px]">
+          <div class="mt-[10px]">
             <wd-button block :round="false" @click="handleSubmit">确 认</wd-button>
+            <!-- <wd-button block :round="true" @click="getOrders">重 置</wd-button> -->
           </div>
+          <!-- <div class="mt-[10px]">
+            <wd-button block :round="false" @click="getOrders">重置</wd-button>
+          </div> -->
         </view>
       </wd-action-sheet>
     </template>
@@ -279,12 +283,12 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
     align-items: center;
     justify-content: space-between;
     > text {
-      background-color: #f0f0f0;
-      border-radius: 4px;
+      display: inline-block;
       width: 40%;
-      line-height: 30px;
       padding-left: 10px;
-      display: inline-block;
+      line-height: 30px;
+      background-color: #f0f0f0;
+      border-radius: 4px;
     }
   }
 }