开放平台

src/api/index.ts

@@ -72,7 +72,7 @@ export const shopEdit = (params: any) => {
 
 // 获取订单列表
 export const orderList = (params: any) => {
-  return get('app/order/list', params)
+  return get('app/order/listNew', params)
 }
 
 // 获取钱包余额

src/util/http.ts

@@ -6,9 +6,9 @@ import { message } from 'ant-design-vue';
 // let appId = process.env.VUE_APP_APPID
 // let appSecret = process.env.VUE_APP_APPSECRET
 // const requestUrl = config.baseUrl
-let appId = 'u9m5aIE4oNjsb02iK'
-let appSecret = 'IO6zzY2TU3uswXbXWmwuSPFXxBri7NsY'
-const requestUrl = 'http://153.37.175.42:8070/'
+let appId = '100001'
+let appSecret = 'jR2MJyYurUJMT15n6MMu70x83uPU5Ri8'
+const requestUrl = 'https://api.liebaoai.cn/'
 //创建axios实例
 const service = axios.create({
   timeout: 30000 //超时时间

src/views/docsCenter/index.vue

@@ -6,7 +6,7 @@ onMounted(() => {
 })
 </script>
 <template>
-  <iframe src="http://open-doc.liebaoai.cn:28088/" frameborder="0" class="center"></iframe>
+  <iframe src="http://open-doc.liebaoai.cn/" frameborder="0" class="center"></iframe>
 </template>
 <style lang='scss' scoped>
 .center {

src/views/management/order/order.vue

@@ -34,6 +34,10 @@ let statusList = reactive({
       name: '配送中'
     },
     {
+      status: 4,
+      name: '已完成'
+    },
+    {
       status: -1,
       name: '已取消'
     },
@@ -77,14 +81,16 @@ interface FormState {
   searchKey: string;
   pageNum: number;
   pageSize: number;
-  type: Number
+  type: Number;
+  searchType: Number
 }
 const formState = reactive<FormState>({
   city: '',
   searchKey: '',
   pageNum: 1,
   pageSize: 10,
-  type: 1
+  type: 1,
+  searchType:1
 });
 const columns = reactive([
   {
@@ -114,7 +120,7 @@ const columns = reactive([
   },
   {
     title: '订单状态',
-    dataIndex: 'status',
+    dataIndex: 'deliveryStatus',
     align: 'center',
   },
   {
@@ -239,8 +245,8 @@ onMounted(() => {
       <template v-if="column.dataIndex === 'deliveryName'">
         <div>{{ record.deliveryName || '- -' }}</div>
       </template>
-      <template v-if="column.dataIndex === 'status'">
-        <div>{{ showOrderStatus(record.status) }}</div>
+      <template v-if="column.dataIndex === 'deliveryStatus'">
+        <div>{{ showOrderStatus(record.deliveryStatus) }}</div>
       </template>
       <template v-if="column.dataIndex === 'deliveries'">
         <div class="flex justify-center">

src/views/register/index.vue

@@ -39,7 +39,7 @@ let time = ref<number>(60)
 let timer = ref<any>()
 let canSendSms = ref<boolean>(true)
 let labelCol = ref<object>({ style: { width: '140px' } })
-let action = ref<string>('http://153.37.175.42:8070/app/common/upload')
+let action = ref<string>('http://test.liebaoai.cn/app/common/upload')
 let checked = ref<boolean>(false)
 let showAgreement = ref<boolean>(false)
 
@@ -104,7 +104,9 @@ watch(formState, (newValue) => {
   console.log('数据：', newValue);
   if (newValue.userAccount && newValue.password && newValue.passwordAgain && newValue.code) {
     firstDisabled.value = false
-    if (newValue.address && newValue.street && newValue.merchantName && newValue.bizLicenseNo && newValue.bizLicense && newValue.legalPerson && newValue.idcardNo && newValue.idcardFront && newValue.idcardBack && newValue.bizLicenseIdcard && newValue.contactName && newValue.mobile) {
+  // if (newValue.address && newValue.street && newValue.merchantName && newValue.bizLicenseNo && newValue.bizLicense && newValue.legalPerson && newValue.idcardNo && newValue.idcardFront && newValue.idcardBack && newValue.bizLicenseIdcard && newValue.contactName && newValue.mobile) {
+      if (newValue.street && newValue.merchantName && newValue.bizLicenseNo && newValue.bizLicense && newValue.legalPerson && newValue.idcardNo && newValue.idcardFront && newValue.idcardBack && newValue.bizLicenseIdcard && newValue.contactName && newValue.mobile) {
+
       submitDisabled.value = false
     } else {
       submitDisabled.value = true
@@ -140,7 +142,7 @@ function getAddressInfo() {
       "plugins": ['AMap.Geocoder'],           // 需要使用的的插件列表，如比例尺'AMap.Scale'等
     }).then((AMap: { Geocoder: new () => any; }) => {
       let geocoder = new AMap.Geocoder()
-      geocoder.getLocation(formState.address, function (status: string, result: { info: string; }) {
+      geocoder.getLocation(formState.cityName+formState.districtName+formState.street, function (status: string, result: { info: string; }) {
         console.log('result:', status, result);
         if (status === 'complete' && result.info === 'OK') {
           // result中对应详细地理坐标信息