冲突

3 years ago · f24f4c81cb
parent 4b87cfe409 4612bd4fc4
commit f24f4c81cb
10 changed files with 19 additions and 10 deletions
--- a/manifest.json
+++ b/manifest.json
@ -17,7 +17,9 @@
            "delay" : 0
        },
        /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Payment" : {}
+        },
        /* 应用发布信息 */
        "distribute" : {
            /* android打包配置 */
@ -44,7 +46,14 @@
            "ios" : {},
            /* SDK配置 */
            "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "android" ],
+                        "appid" : "wx17b34a4a90ef18f7",
+                        "UniversalLinks" : ""
+                    }
+                }
            }
        }
    },
--- a/pages/goods/category.vue
+++ b/pages/goods/category.vue
@ -17,7 +17,7 @@

 			<!-- 右侧 二级分类 -->
 			<scroll-view class="cate-right" @scrolltolower="reachBottom" :scroll-top="scrollTop" :scroll-y="true">
-				<image class="cate-tow-img" src="@/static/goods/category_banner.jpg"></image>
+				<image class="cate-tow-img" :src="`https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/uc/account-avatar/category${categoryData[curIndex].id}.jpg`"></image>
 				<!-- <view @click="onTargetGoodsList(item.id)"> -->
 				<view class="cate-tow-group" :class="idx === categoryData[curIndex].children.length - 1 ? 'cate-tow-group__last' :''"
 					v-for="(item, idx) in categoryData[curIndex].children" :key="idx">
--- a/pages/order/payResult.vue
+++ b/pages/order/payResult.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-04-28 15:01:41
 * @LastEditors: ch
- * @LastEditTime: 2022-05-05 20:05:00
+ * @LastEditTime: 2022-05-06 10:49:00
 * @Description: file content
 -->

@ -29,7 +29,7 @@
 				<view class="title">支付失败</view>
 				<view class="desc">请重新试试</view>
 				<view class="btns">
-					<UiButton class="btn" @click="back">返 回</UiButton>
+					<UiButton class="btn" @click="$Router.replace(`/orderDetail?id=${$Route.query.orderId}`)">查看订单详情</UiButton>
 				</view>
 			</template>
 		</template>
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@ -2,8 +2,8 @@
 * @Author: ch
 * @Date: 2022-05-05 20:07:21
 * @LastEditors: ch
- * @LastEditTime: 2022-05-05 22:00:54
+ * @LastEditTime: 2022-05-06 10:53:12
 * @Description: file content
 -->
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.662452a8.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.091fadad.js></script></body></html>
--- a/unpackage/dist/build/h5/static/img/category_banner.af669ac8.jpg
+++ b/unpackage/dist/build/h5/static/img/category_banner.af669ac8.jpg
--- a/unpackage/dist/build/h5/static/js/index.091fadad.js
+++ b/unpackage/dist/build/h5/static/js/index.091fadad.js
--- a/unpackage/dist/build/h5/static/js/pages-goods-category.1d3ab2f0.js
+++ b/unpackage/dist/build/h5/static/js/pages-goods-category.1d3ab2f0.js
--- a/unpackage/dist/build/h5/static/js/pages-goods-category.c515cf1a.js
+++ b/unpackage/dist/build/h5/static/js/pages-goods-category.c515cf1a.js
--- a/unpackage/dist/build/h5/static/js/pages-order-payResult.117e1af4.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-payResult.117e1af4.js
--- a/unpackage/dist/build/h5/static/js/pages-order-payResult.bd53db39.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-payResult.bd53db39.js