订单数量，个人信息修改，收藏，收货地址，全部订单接口简单替换

sheep/api/app.js

@@ -107,16 +107,20 @@ export default {
       title: '上传中',
     });
     return new Promise((resolve, reject) => {
+		// 此处先换成yudao
       uni.uploadFile({
-        url: baseUrl + '/file/api/upload',
+        url: 'http://api-dashboard.yudao.iocoder.cn' + '/app-api/infra/file/upload',
         filePath: file,
         name: 'file',
         formData: {
           group,
         },
         header: {
-          Accept: 'text/json',
-          Authorization: token,
+          // Accept: 'text/json',
+          // Authorization: token,
+		  Accept : '*/*',
+		  'tenant-id' :'1',
+		  Authorization:  'Bearer test247',
         },
         success: (uploadFileRes) => {
           let result = JSON.parse(uploadFileRes.data);

sheep/api/data.js

@@ -1,11 +1,17 @@
 import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 
 export default {
   area: () =>
-    request({
-      url: 'data/area',
+    request2({
+      url: 'system/area/tree',
       method: 'GET',
     }),
+  // area: () =>
+  //   request({
+  //     url: 'data/area',
+  //     method: 'GET',
+  //   }),
   faq: () =>
     request({
       url: 'data/faq',

sheep/api/order.js

@@ -1,4 +1,5 @@
 import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 
 export default {
   // 订单详情
@@ -33,14 +34,23 @@ export default {
     }),
   // 订单列表
   list: (params) =>
-    request({
-      url: 'order/order',
+    request2({
+      url: 'trade/order/page',
       method: 'GET',
       params,
       custom: {
         showLoading: false,
       },
     }),
+  // list: (params) =>
+  //   request({
+  //     url: 'order/order',
+  //     method: 'GET',
+  //     params,
+  //     custom: {
+  //       showLoading: false,
+  //     },
+  //   }),
   // 计算订单信息
   calc: (data) =>
     request({

sheep/api/user.js

@@ -3,339 +3,414 @@ import request2 from '@/sheep/request2';
 import $platform from '@/sheep/platform';
 
 export default {
-  profile: () =>
-    request2({
-      url: 'member/user/get',
-      method: 'GET',
-      custom: {
-        showLoading: false,
-        auth: true,
-      },
-    }),
-  // profile: () =>
-  //   request({
-  //     url: '/user/api/user/profile',
-  //     method: 'GET',
-  //     custom: {
-  //       showLoading: false,
-  //       auth: true,
-  //     },
-  //   }),
-  update: (data) =>
-    request({
-      url: '/user/api/user/update',
-      method: 'POST',
-      custom: {
-        showSuccess: true,
-        auth: true,
-      },
-      data,
-    }),
-  // 账号登录
-  accountLogin: (data) =>
-    request({
-      url: '/user/api/user/accountLogin',
-      method: 'POST',
-      data,
-      custom: {
-        showSuccess: true,
-        loadingMsg: '登录中',
-      },
-    }),
-  // 短信登录
-  smsLogin: (data) =>
-    request({
-      url: '/user/api/user/smsLogin',
-      method: 'POST',
-      data,
-      custom: {
-        showSuccess: true,
-        loadingMsg: '登录中',
-      },
-    }),
-  // 短信注册
-  smsRegister: (data) =>
-    request({
-      url: '/user/api/user/smsRegister',
-      method: 'POST',
-      data,
-      custom: {
-        showSuccess: true,
-        loadingMsg: '正在注册',
-      },
-    }),
-  // 重置密码
-  resetPassword: (data) =>
-    request({
-      url: '/user/api/user/resetPassword',
-      method: 'POST',
-      data,
-      custom: {
-        showSuccess: true,
-        loadingMsg: '验证中',
-      },
-    }),
+	profile: () =>
+		request2({
+			url: 'member/user/get',
+			method: 'GET',
+			custom: {
+				showLoading: false,
+				auth: true,
+			},
+		}),
+	// profile: () =>
+	//   request({
+	//     url: '/user/api/user/profile',
+	//     method: 'GET',
+	//     custom: {
+	//       showLoading: false,
+	//       auth: true,
+	//     },
+	//   }),
+	// update: (data) =>
+	//   request({
+	//     url: '/user/api/user/update',
+	//     method: 'POST',
+	//     custom: {
+	//       showSuccess: true,
+	//       auth: true,
+	//     },
+	//     data,
+	//   }),
+	update: (data) =>
+		request2({
+			url: 'member/user/update',
+			method: 'PUT',
+			custom: {
+				showSuccess: true,
+				auth: true,
+			},
+			data,
+		}),
+	// 账号登录
+	accountLogin: (data) =>
+		request({
+			url: '/user/api/user/accountLogin',
+			method: 'POST',
+			data,
+			custom: {
+				showSuccess: true,
+				loadingMsg: '登录中',
+			},
+		}),
+	// 短信登录
+	smsLogin: (data) =>
+		request({
+			url: '/user/api/user/smsLogin',
+			method: 'POST',
+			data,
+			custom: {
+				showSuccess: true,
+				loadingMsg: '登录中',
+			},
+		}),
+	// 短信注册
+	smsRegister: (data) =>
+		request({
+			url: '/user/api/user/smsRegister',
+			method: 'POST',
+			data,
+			custom: {
+				showSuccess: true,
+				loadingMsg: '正在注册',
+			},
+		}),
+	// 重置密码
+	resetPassword: (data) =>
+		request({
+			url: '/user/api/user/resetPassword',
+			method: 'POST',
+			data,
+			custom: {
+				showSuccess: true,
+				loadingMsg: '验证中',
+			},
+		}),
 
-  // 修改密码
-  changePassword: (data) =>
-    request({
-      url: '/user/api/user/changePassword',
-      method: 'POST',
-      data,
-      custom: {
-        showSuccess: true,
-        loadingMsg: '验证中',
-      },
-    }),
+	// 修改密码
+	changePassword: (data) =>
+		request({
+			url: '/user/api/user/changePassword',
+			method: 'POST',
+			data,
+			custom: {
+				showSuccess: true,
+				loadingMsg: '验证中',
+			},
+		}),
 
-  // 绑定、更换手机号
-  changeMobile: (data) =>
-    request({
-      url: '/user/api/user/changeMobile',
-      method: 'POST',
-      data,
-      custom: {
-        showSuccess: true,
-        loadingMsg: '验证中',
-      },
-    }),
+	// 绑定、更换手机号
+	changeMobile: (data) =>
+		request({
+			url: '/user/api/user/changeMobile',
+			method: 'POST',
+			data,
+			custom: {
+				showSuccess: true,
+				loadingMsg: '验证中',
+			},
+		}),
 
-  // 修改用户名
-  changeUsername: (data) =>
-    request({
-      url: '/user/api/user/changeUsername',
-      method: 'POST',
-      data,
-      custom: {
-        showSuccess: true,
-        loadingMsg: '验证中',
-      },
-    }),
+	// 修改用户名
+	changeUsername: (data) =>
+		request({
+			url: '/user/api/user/changeUsername',
+			method: 'POST',
+			data,
+			custom: {
+				showSuccess: true,
+				loadingMsg: '验证中',
+			},
+		}),
 
-  // 更新小程序信息
-  updateMpUserInfo: (data) =>
-    request({
-      url: '/user/api/user/updateMpUserInfo',
-      method: 'POST',
-      data,
-    }),
+	// 更新小程序信息
+	updateMpUserInfo: (data) =>
+		request({
+			url: '/user/api/user/updateMpUserInfo',
+			method: 'POST',
+			data,
+		}),
 
-  // 第三方授权信息
-  thirdOauthInfo: () =>
-    request({
-      url: '/user/api/user/thirdOauth',
-      method: 'GET',
-      params: {
-        provider: $platform.provider,
-        platform: $platform.platform,
-      },
-      custom: {
-        showLoading: false,
-      },
-    }),
+	// 第三方授权信息
+	thirdOauthInfo: () =>
+		request({
+			url: '/user/api/user/thirdOauth',
+			method: 'GET',
+			params: {
+				provider: $platform.provider,
+				platform: $platform.platform,
+			},
+			custom: {
+				showLoading: false,
+			},
+		}),
 
-  // 添加分享记录
-  addShareLog: (data) =>
-    request({
-      url: 'share/add',
-      method: 'POST',
-      data,
-      custom: {
-        showError: false,
-      },
-    }),
-  share: {
-    list: (params) =>
-      request({
-        url: 'share/list',
-        method: 'GET',
-        params,
-      }),
-  },
-  // 账号登出
-  logout: (data) =>
-    request({
-      url: '/user/api/user/logout',
-      method: 'POST',
-      data,
-    }),
-  // 账号注销
-  logoff: (data) =>
-    request({
-      url: '/user/api/user/logoff',
-      method: 'POST',
-      data,
-    }),
+	// 添加分享记录
+	addShareLog: (data) =>
+		request({
+			url: 'share/add',
+			method: 'POST',
+			data,
+			custom: {
+				showError: false,
+			},
+		}),
+	share: {
+		list: (params) =>
+			request({
+				url: 'share/list',
+				method: 'GET',
+				params,
+			}),
+	},
+	// 账号登出
+	logout: (data) =>
+		request({
+			url: '/user/api/user/logout',
+			method: 'POST',
+			data,
+		}),
+	// 账号注销
+	logoff: (data) =>
+		request({
+			url: '/user/api/user/logoff',
+			method: 'POST',
+			data,
+		}),
 
-  address: {
-    default: () =>
-      request({
-        url: 'user/address/default',
-        method: 'GET',
-        custom: {
-          showError: false,
-        },
-      }),
-    list: () =>
-      request({
-        url: 'user/address',
-        method: 'GET',
-        custom: {},
-      }),
-    create: (data) =>
-      request({
-        url: 'user/address',
-        method: 'POST',
-        data,
-        custom: {
-          showSuccess: true,
-        },
-      }),
-    update: (id, data) =>
-      request({
-        url: 'user/address/' + id,
-        method: 'PUT',
-        data,
-        custom: {
-          showSuccess: true,
-        },
-      }),
-    detail: (id) =>
-      request({
-        url: 'user/address/' + id,
-        method: 'GET',
-      }),
-    delete: (id) =>
-      request({
-        url: 'user/address/' + id,
-        method: 'DELETE',
-      }),
-  },
-  invoice: {
-    list: () =>
-      request({
-        url: 'user/invoice',
-        method: 'GET',
-        custom: {},
-      }),
-    create: (data) =>
-      request({
-        url: 'user/invoice',
-        method: 'POST',
-        data,
-        custom: {
-          showSuccess: true,
-        },
-      }),
-    update: (id, data) =>
-      request({
-        url: 'user/invoice/' + id,
-        method: 'PUT',
-        data,
-        custom: {
-          showSuccess: true,
-        },
-      }),
-    detail: (id) =>
-      request({
-        url: 'user/invoice/' + id,
-        method: 'GET',
-      }),
-    delete: (id) =>
-      request({
-        url: 'user/invoice/' + id,
-        method: 'DELETE',
-      }),
-  },
-  favorite: {
-    list: (params) =>
-      request({
-        url: 'user/goodsLog/favorite',
-        method: 'GET',
-        params,
-      }),
-    do: (id) =>
-      request({
-        url: 'user/goodsLog/favorite',
-        method: 'POST',
-        data: {
-          goods_id: id,
-        },
-        custom: {
-          showSuccess: true,
-          auth: true,
-        },
-      }),
-    cancel: (id) =>
-      request({
-        url: 'user/goodsLog/favorite',
-        method: 'POST',
-        data: {
-          goods_ids: id,
-        },
-        custom: {
-          showSuccess: true,
-          auth: true,
-        },
-      }),
-  },
-  view: {
-    list: (params) =>
-      request({
-        url: 'user/goodsLog/views',
-        method: 'GET',
-        params,
-        custom: {},
-      }),
-    delete: (data) =>
-      request({
-        url: 'user/goodsLog/viewDel',
-        method: 'DELETE',
-        data,
-        custom: {
-          showSuccess: true,
-        },
-      }),
-  },
-  wallet: {
-    log: (params) =>
-      request({
-        url: '/user/api/walletLog',
-        method: 'GET',
-        params,
-        custom: {},
-      }),
-  },
-  account: {
-    info: (params) =>
-      request({
-        url: 'user/account',
-        method: 'GET',
-        params,
-        custom: {
-          showError: false,
-          auth: true,
-        },
-      }),
-    save: (data) =>
-      request({
-        url: 'user/account',
-        method: 'POST',
-        data,
-        custom: {
-          showSuccess: true,
-          auth: true,
-        },
-      }),
-  },
-  //数量接口
-  data: () =>
-    request({
-      url: 'user/user/data',
-      method: 'GET',
-      custom: {
-        showLoading: false,
-        auth: true,
-      },
-    }),
-};
+	address: {
+		default: () =>
+			request({
+				url: 'user/address/default',
+				method: 'GET',
+				custom: {
+					showError: false,
+				},
+			}),
+		list: () =>
+			request2({
+				url: 'member/address/list',
+				method: 'GET',
+				custom: {},
+			}),
+		// list: () =>
+		//   request({
+		//     url: 'user/address',
+		//     method: 'GET',
+		//     custom: {},
+		//   }),
+		create: (data) =>
+			request2({
+				url: 'member/address/create',
+				method: 'POST',
+				data,
+				custom: {
+					showSuccess: true,
+				},
+			}),
+		// create: (data) =>
+		//   request({
+		//     url: 'user/address',
+		//     method: 'POST',
+		//     data,
+		//     custom: {
+		//       showSuccess: true,
+		//     },
+		//   }),
+		update: ( data) =>
+			request2({
+				url: 'member/address/update',
+				method: 'PUT',
+				data,
+				custom: {
+					showSuccess: true,
+				},
+			}),
+		// update: (id, data) =>
+		// 	request({
+		// 		url: 'user/address/' + id,
+		// 		method: 'PUT',
+		// 		data,
+		// 		custom: {
+		// 			showSuccess: true,
+		// 		},
+		// 	}),
+		detail: (id) =>
+			request2({
+				url: 'member/address/get?id=' + id,
+				method: 'GET',
+			}),
+		// detail: (id) =>
+		//   request({
+		//     url: 'user/address/' + id,
+		//     method: 'GET',
+		//   }),
+		delete: (id) =>
+			request2({
+				url: 'member/address/delete?id=' + id,
+				method: 'DELETE',
+			}),
+		// delete: (id) =>
+		// 	request({
+		// 		url: 'user/address/' + id,
+		// 		method: 'DELETE',
+		// 	}),
+	},
+	invoice: {
+		list: () =>
+			request({
+				url: 'user/invoice',
+				method: 'GET',
+				custom: {},
+			}),
+		create: (data) =>
+			request({
+				url: 'user/invoice',
+				method: 'POST',
+				data,
+				custom: {
+					showSuccess: true,
+				},
+			}),
+		update: (id, data) =>
+			request({
+				url: 'user/invoice/' + id,
+				method: 'PUT',
+				data,
+				custom: {
+					showSuccess: true,
+				},
+			}),
+		detail: (id) =>
+			request({
+				url: 'user/invoice/' + id,
+				method: 'GET',
+			}),
+		delete: (id) =>
+			request({
+				url: 'user/invoice/' + id,
+				method: 'DELETE',
+			}),
+	},
+	favorite: {
+		list: (params) =>
+			request2({
+				url: 'product/favorite/page',
+				method: 'GET',
+				params,
+			}),
+		do: (id) =>
+			request({
+				url: 'user/goodsLog/favorite',
+				method: 'POST',
+				data: {
+					goods_id: id,
+				},
+				custom: {
+					showSuccess: true,
+					auth: true,
+				},
+			}),
+		// 取消收藏
+		cancel: (id) =>
+			request2({
+				url: 'product/favorite/delete-list',
+				method: 'DELETE',
+				data: {
+					spuIds: id.split(','),
+				},
+				custom: {
+					showSuccess: true,
+					auth: true,
+				},
+			}),
+		// cancel: (id) =>
+		//   request({
+		//     url: 'user/goodsLog/favorite',
+		//     method: 'POST',
+		//     data: {
+		//       goods_ids: id,
+		//     },
+		//     custom: {
+		//       showSuccess: true,
+		//       auth: true,
+		//     },
+		//   }),
+	},
+	view: {
+		list: (params) =>
+			request({
+				url: 'user/goodsLog/views',
+				method: 'GET',
+				params,
+				custom: {},
+			}),
+		delete: (data) =>
+			request({
+				url: 'user/goodsLog/viewDel',
+				method: 'DELETE',
+				data,
+				custom: {
+					showSuccess: true,
+				},
+			}),
+	},
+	wallet: {
+		log: (params) =>
+			request({
+				url: '/user/api/walletLog',
+				method: 'GET',
+				params,
+				custom: {},
+			}),
+	},
+	account: {
+		info: (params) =>
+			request({
+				url: 'user/account',
+				method: 'GET',
+				params,
+				custom: {
+					showError: false,
+					auth: true,
+				},
+			}),
+		save: (data) =>
+			request({
+				url: 'user/account',
+				method: 'POST',
+				data,
+				custom: {
+					showSuccess: true,
+					auth: true,
+				},
+			}),
+	},
+	//数量接口
+	// data: () =>
+	//   request({
+	//     url: 'user/user/data',
+	//     method: 'GET',
+	//     custom: {
+	//       showLoading: false,
+	//       auth: true,
+	//     },
+	//   }),
+	data: () =>
+		request2({
+			url: 'trade/order/get-count',
+			method: 'GET',
+			custom: {
+				showLoading: false,
+				auth: true,
+			},
+		}),
+	data2: () =>
+		request2({
+			url: 'trade/after-sale/get-applying-count',
+			method: 'GET',
+			custom: {
+				showLoading: false,
+				auth: true,
+			},
+		}),
+};

sheep/components/s-address-item/s-address-item.vue

@@ -9,13 +9,14 @@
           class="ss-m-r-10"
           size="small"
           custom-style="background-color: var(--ui-BG-Main); border-color: var(--ui-BG-Main); color: #fff;"
-          v-if="props.item.is_default"
+          v-if="props.item.defaultStatus"
           text="默认"
         ></uni-tag>
-        {{ props.item.province_name }} {{ props.item.city_name }} {{ props.item.district_name }}
+        {{ props.item.areaName }}
+		<!-- {{ props.item.city_name }} {{ props.item.district_name }} -->
       </view>
-      <view class="address-text">{{ props.item.address }}</view>
-      <view class="person-text">{{ props.item.consignee }} {{ props.item.mobile }}</view>
+      <view class="address-text">{{ props.item.detailAddress }}</view>
+      <view class="person-text">{{ props.item.name }} {{ props.item.mobile }}</view>
     </view>
     <view v-else><view class="address-text ss-m-b-10">请选择收货地址</view></view>
     <slot>

sheep/components/s-order-card/s-order-card.vue

@@ -64,6 +64,7 @@
   ];
 
   const numData = computed(() => sheep.$store('user').numData);
+  console.log(numData)
 </script>
 
 <style lang="scss" scoped>

sheep/store/user.js

@@ -62,9 +62,16 @@ const user = defineStore({
 
     // 获取订单、优惠券等其他资产信息
     async getNumData() {
-      const { error, data } = await userApi.data();
-      if (error === 0) {
-        this.numData = data;
+      const { code, data } = await userApi.data();
+      const data2 = await userApi.data2();
+      if (code === 0&&data2.code===0) {
+		  console.log(data);
+        this.numData = {order_num:{
+			noget:data.deliveredCount,
+			unpaid:data.unpaidCount,
+			nocomment:data.uncommentedCount,
+			aftersale:data2.data
+		}};
       }
     },