From 6722c5b89ee9332e85ef44e1dbaadbffb404db19 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 24 Oct 2021 15:24:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                      |  1 +
 App.vue                         |  5 ++---
 pages.json                      |  2 +-
 pages/user-order/user-order.vue | 18 +++++++++++++-----
 sitemap.json                    |  7 -------
 5 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100644 sitemap.json

diff --git a/.gitignore b/.gitignore
index e6512c00..1318ade3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .hbuilderx
 *.log
 unpackage
+sitemap.json
\ No newline at end of file
diff --git a/App.vue b/App.vue
index dbf52000..71f594e8 100644
--- a/App.vue
+++ b/App.vue
@@ -35,12 +35,11 @@
                 ],
                 // 请求地址
                 request_url: 'https://d1.shopxo.vip/',
-                //request_url: 'http://shopxo.com/',
                 // 静态资源地址
-                static_url: 'https://dev.shopxo.vip/',
+                static_url: 'https://d1.shopxo.vip/',
                 // 基础信息
                 application_title: "ShopXO",
-                application_describe: "ShopXO开源商城",
+                application_describe: "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求",
                 application_type: "weixin",
                 // 版本号
                 version: "v2.2.1",
diff --git a/pages.json b/pages.json
index 25af2855..eec3c101 100644
--- a/pages.json
+++ b/pages.json
@@ -629,7 +629,7 @@
 	],
     "subPackages": [],
 	"globalStyle": {
-		"navigationBarTitleText": "ShopXO开源商城",
+		"navigationBarTitleText": "ShopXO",
         "navigationBarTextStyle": "black",
 		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#f5f5f5",
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
index ae20bcbb..1ff98680 100644
--- a/pages/user-order/user-order.vue
+++ b/pages/user-order/user-order.vue
@@ -367,8 +367,9 @@
                                             success: function(res) {
                                                 // 数据设置
                                                 self.order_item_pay_success_handle(
-                                                order_ids); // 跳转支付页面
-
+                                                order_ids);
+                                                
+                                                // 跳转支付页面
                                                 uni.navigateTo({
                                                     url: "/pages/paytips/paytips?code=9000"
                                                 });
@@ -423,7 +424,9 @@
                 
                 // 数据设置
                 for (var i in temp_data_list) {
-                    if (order_ids_arr.indexOf(temp_data_list[i]['id']) != -1) {
+                    if (order_ids_arr.indexOf(temp_data_list[i]['id']) != -1) {
+                        temp_data_list[i]['operate_data']['is_pay'] = 0;
+                        temp_data_list[i]['operate_data']['is_cancel'] = 0;
                         switch (parseInt(temp_data_list[i]['order_model'])) {
                             // 销售模式
                             case 0:
@@ -478,7 +481,9 @@
                                         var temp_data_list = this.data_list;
                                         temp_data_list[index]['status'] = 5;
                                         temp_data_list[index]['status_name'] = '已取消';
-                                        temp_data_list[index]['operate_data']['is_cancel'] = 0;
+                                        temp_data_list[index]['operate_data']['is_cancel'] = 0;
+                                        temp_data_list[index]['operate_data']['is_delete'] = 1;
+                                        temp_data_list[index]['is_can_launch_aftersale'] = 0;
                                         this.setData({
                                             data_list: temp_data_list
                                         });
@@ -577,8 +582,11 @@
                                     if (res.data.code == 0) {
                                         var temp_data_list = this.data_list;
                                         temp_data_list.splice(index, 1);
+                                        var len = temp_data_list.length;
                                         this.setData({
-                                            data_list: temp_data_list
+                                            data_list: temp_data_list,
+                                            data_list_loding_status: (len == 0) ? 0 : 3,
+                                            data_bottom_line_status: (len == 0) ? false : this.data_bottom_line_status,
                                         });
                                         app.globalData.showToast(res.data.msg, "success");
                                     } else {
diff --git a/sitemap.json b/sitemap.json
deleted file mode 100644
index ca02add2..00000000
--- a/sitemap.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [{
-  "action": "allow",
-  "page": "*"
-  }]
-}
\ No newline at end of file