hwq 4 rokov pred
rodič
commit
623ff725da

+ 20 - 8
manifest.json

@@ -23,16 +23,27 @@
             "android" : {
                 /* android打包配置 */
                 "permissions" : [
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                 "autoSdkPermissions" : true
             },
             "ios" : {
-                "idfa" : false
+                "idfa" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:http://shop.zhengyjk1994.com" ]
+                    }
+                }
             },
             /* ios打包配置 */
             "sdkConfigs" : {
@@ -40,15 +51,15 @@
                 "oauth" : {},
                 "geolocation" : {},
                 "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "android" ],
-                        "appid" : "wxe7542891b1e27ad1",
-                        "UniversalLinks" : ""
-                    },
                     "alipay" : {
                         "__platform__" : [ "ios", "android" ]
                     },
-                    "appleiap" : {}
+                    "appleiap" : {},
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wxe7542891b1e27ad1",
+                        "UniversalLinks" : "https://shop.zhengyjk1994.com/ulink/"
+                    }
                 },
                 "push" : {},
                 "share" : {},
@@ -144,6 +155,7 @@
             "proxy" : {
                 "/api" : {
                     "target" : "http://shop.zhengyjk1994.com", //请求的目标域名
+					// "target" : "http://po.frp.liuniu946.com", //请求的目标域名
                     "changeOrigin" : true,
                     // "secure": false,
                     "pathRewrite" : {}

+ 4 - 1
pages/money/pay.vue

@@ -253,10 +253,10 @@ export default {
 					obj.payLoding = false;
 				})
 				.catch(e => {
+					console.log(e);
 					// 支付完成
 					uni.hideLoading();
 					obj.payLoding = false;
-					console.log(e);
 				});
 		},
 		// 支付成功跳转
@@ -305,6 +305,7 @@ export default {
 				// 初次生成订单
 				obj.firstCreateOrder();
 			} else {
+				console.log("重新提交")
 				// 已经生成订单未支付
 				obj.orderMoneyPay();
 			}
@@ -343,6 +344,7 @@ export default {
 			// 生成订单
 			createOrderkey(data, obj.orderKey)
 				.then(({ data, status, msg }) => {
+					console.log(data,status, msg,"123456");
 					// 判断是否支付失败
 					if (data.status == 'ORDER_EXIST') {
 						uni.showModal({
@@ -366,6 +368,7 @@ export default {
 						}
 					} else {
 						// 立即支付
+						console.log(1111)
 						obj.orderMoneyPay();
 					}
 				})

+ 1 - 1
store/index.js

@@ -6,8 +6,8 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	namespaced: true,
 	state: {
-		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
 		baseURL:'http://shop.zhengyjk1994.com',//请求地址配置 
+		// baseURL:'http://po.frp.liuniu946.com',//请求地址配置
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录

+ 10 - 2
unpackage/cache/appleConfig.ini

@@ -1,5 +1,5 @@
 [appleAppid]
-appleAppid=liuniucen.liuniu946.com
+appleAppid=com.zy.inc
 
 [appstore]
 appstore=
@@ -8,5 +8,13 @@ appstore=
 iosStyle=storyboard
 
 [universalLinks]
-universalLinks=
+universalLinks=https://shop.zhengyjk1994.com/ulink/
 spaceid=
+
+[universalLinks_qq]
+universalLinks_qq=
+spaceid_qq=
+
+[universalLinks_weibo]
+universalLinks_weibo=
+spaceid_weibo=

+ 2 - 2
unpackage/cache/certdataios

@@ -1,3 +1,3 @@
-iosProfile=D:/工作/项目2/矿/ios/liuniuren.mobileprovision
-ioscertFile=D:/工作/项目2/矿/ios/证书(六牛人).p12
+iosProfile=D:/工作/项目2/正一药业/zhengyi/unpackage/res/zhengyishop.mobileprovision
+ioscertFile=D:/工作/项目2/正一药业/zhengyi/unpackage/res/证书.p12
 ioscertPassword=ep/Tdjka4Y7WYqDB6/S7dw==

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/app-plus/app-config-service.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


+ 67 - 70
unpackage/dist/dev/app-plus/app-view.js

@@ -4485,21 +4485,18 @@ var render = function() {
                     "v-uni-view",
                     { staticClass: _vm._$g(15, "sc"), attrs: { _i: 15 } },
                     [
-                      _c("v-uni-image", {
-                        attrs: { src: _vm._$g(16, "a-src"), mode: "", _i: 16 }
-                      }),
-                      _c("v-uni-text", { attrs: { _i: 17 } }, [
-                        _vm._v(_vm._$g(17, "t0-0"))
+                      _c("v-uni-text", { attrs: { _i: 16 } }, [
+                        _vm._v(_vm._$g(16, "t0-0"))
                       ]),
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(18, "sc"), attrs: { _i: 18 } },
+                        { staticClass: _vm._$g(17, "sc"), attrs: { _i: 17 } },
                         [_vm._v("积分")]
                       ),
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(19, "sc"), attrs: { _i: 19 } },
-                        [_vm._v("¥" + _vm._$g(19, "t0-0"))]
+                        { staticClass: _vm._$g(18, "sc"), attrs: { _i: 18 } },
+                        [_vm._v("¥" + _vm._$g(18, "t0-0"))]
                       )
                     ],
                     1
@@ -4507,41 +4504,41 @@ var render = function() {
                 ],
                 1
               ),
-              _vm._$g(20, "i")
+              _vm._$g(19, "i")
                 ? _c(
                     "v-uni-text",
-                    { staticClass: _vm._$g(20, "sc"), attrs: { _i: 20 } },
-                    [_vm._v(_vm._$g(20, "t0-0"))]
+                    { staticClass: _vm._$g(19, "sc"), attrs: { _i: 19 } },
+                    [_vm._v(_vm._$g(19, "t0-0"))]
                   )
                 : _c(
                     "v-uni-text",
-                    { staticClass: _vm._$g(21, "sc"), attrs: { _i: 21 } },
-                    [_vm._v(_vm._$g(21, "t0-0"))]
+                    { staticClass: _vm._$g(20, "sc"), attrs: { _i: 20 } },
+                    [_vm._v(_vm._$g(20, "t0-0"))]
                   )
             ],
             1
           )
         : _vm._e(),
-      _vm._$g(22, "i")
+      _vm._$g(21, "i")
         ? _c(
             "v-uni-view",
-            { staticClass: _vm._$g(22, "sc"), attrs: { _i: 22 } },
-            [_vm._v(_vm._$g(22, "t0-0"))]
+            { staticClass: _vm._$g(21, "sc"), attrs: { _i: 21 } },
+            [_vm._v(_vm._$g(21, "t0-0"))]
           )
         : _vm._e(),
-      _vm._$g(23, "i")
+      _vm._$g(22, "i")
         ? _c(
             "v-uni-view",
-            { staticClass: _vm._$g(23, "sc"), attrs: { _i: 23 } },
+            { staticClass: _vm._$g(22, "sc"), attrs: { _i: 22 } },
             [
               _c(
                 "v-uni-view",
-                { staticClass: _vm._$g(24, "sc"), attrs: { _i: 24 } },
+                { staticClass: _vm._$g(23, "sc"), attrs: { _i: 23 } },
                 [_vm._v("兑换说明")]
               ),
               _c(
                 "v-uni-view",
-                { staticClass: _vm._$g(25, "sc"), attrs: { _i: 25 } },
+                { staticClass: _vm._$g(24, "sc"), attrs: { _i: 24 } },
                 [
                   _vm._v(
                     "兑换说明详细介绍兑换说明详细介绍兑换兑换说明详细介绍兑换说明详细介绍兑换兑换说明详细介绍兑换说明"
@@ -4552,9 +4549,9 @@ var render = function() {
             1
           )
         : _vm._e(),
-      _vm._$g(26, "i")
+      _vm._$g(25, "i")
         ? _c("estimate", {
-            attrs: { _i: 26 },
+            attrs: { _i: 25 },
             on: {
               navTo: function($event) {
                 return _vm.$handleViewEvent($event)
@@ -4562,10 +4559,10 @@ var render = function() {
             }
           })
         : _vm._e(),
-      _c("content-text", { attrs: { _i: 27 } }),
-      _c("v-uni-view", { staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } }),
+      _c("content-text", { attrs: { _i: 26 } }),
+      _c("v-uni-view", { staticClass: _vm._$g(27, "sc"), attrs: { _i: 27 } }),
       _c("product-bottom", {
-        attrs: { _i: 29 },
+        attrs: { _i: 28 },
         on: {
           buy: function($event) {
             return _vm.$handleViewEvent($event)
@@ -4578,9 +4575,9 @@ var render = function() {
       _c(
         "v-uni-view",
         {
-          staticClass: _vm._$g(30, "sc"),
-          class: _vm._$g(30, "c"),
-          attrs: { _i: 30 },
+          staticClass: _vm._$g(29, "sc"),
+          class: _vm._$g(29, "c"),
+          attrs: { _i: 29 },
           on: {
             touchmove: function($event) {
               return _vm.$handleViewEvent($event, { stop: true, prevent: true })
@@ -4592,14 +4589,14 @@ var render = function() {
         },
         [
           _c("v-uni-view", {
-            staticClass: _vm._$g(31, "sc"),
-            attrs: { _i: 31 }
+            staticClass: _vm._$g(30, "sc"),
+            attrs: { _i: 30 }
           }),
           _c(
             "v-uni-view",
             {
-              staticClass: _vm._$g(32, "sc"),
-              attrs: { _i: 32 },
+              staticClass: _vm._$g(31, "sc"),
+              attrs: { _i: 31 },
               on: {
                 click: function($event) {
                   return _vm.$handleViewEvent($event, { stop: true })
@@ -4609,34 +4606,34 @@ var render = function() {
             [
               _c(
                 "v-uni-view",
-                { staticClass: _vm._$g(33, "sc"), attrs: { _i: 33 } },
+                { staticClass: _vm._$g(32, "sc"), attrs: { _i: 32 } },
                 [
                   _c("v-uni-image", {
-                    attrs: { src: _vm._$g(34, "a-src"), _i: 34 }
+                    attrs: { src: _vm._$g(33, "a-src"), _i: 33 }
                   }),
                   _c(
                     "v-uni-view",
-                    { staticClass: _vm._$g(35, "sc"), attrs: { _i: 35 } },
+                    { staticClass: _vm._$g(34, "sc"), attrs: { _i: 34 } },
                     [
                       _c(
                         "v-uni-text",
-                        { staticClass: _vm._$g(36, "sc"), attrs: { _i: 36 } },
-                        [_vm._v(_vm._$g(36, "t0-0"))]
+                        { staticClass: _vm._$g(35, "sc"), attrs: { _i: 35 } },
+                        [_vm._v(_vm._$g(35, "t0-0"))]
                       ),
                       _c(
                         "v-uni-view",
-                        { staticClass: _vm._$g(37, "sc"), attrs: { _i: 37 } },
+                        { staticClass: _vm._$g(36, "sc"), attrs: { _i: 36 } },
                         [
-                          _c("v-uni-text", { attrs: { _i: 38 } }, [
+                          _c("v-uni-text", { attrs: { _i: 37 } }, [
                             _vm._v("¥")
                           ]),
-                          _vm._v(_vm._$g(37, "t1-0"))
+                          _vm._v(_vm._$g(36, "t1-0"))
                         ],
                         1
                       ),
                       _c("v-uni-image", {
-                        staticClass: _vm._$g(39, "sc"),
-                        attrs: { src: _vm._$g(39, "a-src"), mode: "", _i: 39 },
+                        staticClass: _vm._$g(38, "sc"),
+                        attrs: { src: _vm._$g(38, "a-src"), mode: "", _i: 38 },
                         on: {
                           click: function($event) {
                             return _vm.$handleViewEvent($event)
@@ -4649,25 +4646,25 @@ var render = function() {
                 ],
                 1
               ),
-              _vm._l(_vm._$g(40, "f"), function(item, index, $20, $30) {
+              _vm._l(_vm._$g(39, "f"), function(item, index, $20, $30) {
                 return _c(
                   "v-uni-view",
                   {
                     key: item,
-                    staticClass: _vm._$g("40-" + $30, "sc"),
-                    attrs: { _i: "40-" + $30 }
+                    staticClass: _vm._$g("39-" + $30, "sc"),
+                    attrs: { _i: "39-" + $30 }
                   },
                   [
-                    _c("v-uni-text", { attrs: { _i: "41-" + $30 } }, [
-                      _vm._v("选择" + _vm._$g("41-" + $30, "t0-0") + "分类")
+                    _c("v-uni-text", { attrs: { _i: "40-" + $30 } }, [
+                      _vm._v("选择" + _vm._$g("40-" + $30, "t0-0") + "分类")
                     ]),
                     _c(
                       "v-uni-view",
                       {
-                        staticClass: _vm._$g("42-" + $30, "sc"),
-                        attrs: { _i: "42-" + $30 }
+                        staticClass: _vm._$g("41-" + $30, "sc"),
+                        attrs: { _i: "41-" + $30 }
                       },
-                      _vm._l(_vm._$g(43 + "-" + $30, "f"), function(
+                      _vm._l(_vm._$g(42 + "-" + $30, "f"), function(
                         childItem,
                         childIndex,
                         $21,
@@ -4677,16 +4674,16 @@ var render = function() {
                           "v-uni-text",
                           {
                             key: childItem,
-                            staticClass: _vm._$g("43-" + $30 + "-" + $31, "sc"),
-                            class: _vm._$g("43-" + $30 + "-" + $31, "c"),
-                            attrs: { _i: "43-" + $30 + "-" + $31 },
+                            staticClass: _vm._$g("42-" + $30 + "-" + $31, "sc"),
+                            class: _vm._$g("42-" + $30 + "-" + $31, "c"),
+                            attrs: { _i: "42-" + $30 + "-" + $31 },
                             on: {
                               click: function($event) {
                                 return _vm.$handleViewEvent($event)
                               }
                             }
                           },
-                          [_vm._v(_vm._$g("43-" + $30 + "-" + $31, "t0-0"))]
+                          [_vm._v(_vm._$g("42-" + $30 + "-" + $31, "t0-0"))]
                         )
                       }),
                       1
@@ -4697,16 +4694,16 @@ var render = function() {
               }),
               _c(
                 "v-uni-view",
-                { staticClass: _vm._$g(44, "sc"), attrs: { _i: 44 } },
+                { staticClass: _vm._$g(43, "sc"), attrs: { _i: 43 } },
                 [
-                  _c("v-uni-text", { attrs: { _i: 45 } }, [_vm._v("购买数量")]),
+                  _c("v-uni-text", { attrs: { _i: 44 } }, [_vm._v("购买数量")]),
                   _c(
                     "v-uni-view",
-                    { staticClass: _vm._$g(46, "sc"), attrs: { _i: 46 } },
+                    { staticClass: _vm._$g(45, "sc"), attrs: { _i: 45 } },
                     [
                       _c("uni-number-box", {
-                        staticClass: _vm._$g(47, "sc"),
-                        attrs: { _i: 47 },
+                        staticClass: _vm._$g(46, "sc"),
+                        attrs: { _i: 46 },
                         on: {
                           eventChange: function($event) {
                             return _vm.$handleViewEvent($event)
@@ -4726,12 +4723,12 @@ var render = function() {
                     {
                       name: "show",
                       rawName: "v-show",
-                      value: _vm._$g(48, "v-show"),
-                      expression: "_$g(48,'v-show')"
+                      value: _vm._$g(47, "v-show"),
+                      expression: "_$g(47,'v-show')"
                     }
                   ],
-                  staticClass: _vm._$g(48, "sc"),
-                  attrs: { _i: 48 },
+                  staticClass: _vm._$g(47, "sc"),
+                  attrs: { _i: 47 },
                   on: {
                     click: function($event) {
                       return _vm.$handleViewEvent($event, { stop: true })
@@ -4747,13 +4744,13 @@ var render = function() {
                     {
                       name: "show",
                       rawName: "v-show",
-                      value: _vm._$g(49, "v-show"),
-                      expression: "_$g(49,'v-show')"
+                      value: _vm._$g(48, "v-show"),
+                      expression: "_$g(48,'v-show')"
                     }
                   ],
-                  staticClass: _vm._$g(49, "sc"),
+                  staticClass: _vm._$g(48, "sc"),
                   staticStyle: { "background-color": "#999999" },
-                  attrs: { _i: 49 }
+                  attrs: { _i: 48 }
                 },
                 [_vm._v("售罄")]
               )
@@ -4763,13 +4760,13 @@ var render = function() {
         ],
         1
       ),
-      _vm._$g(50, "i")
+      _vm._$g(49, "i")
         ? _c(
             "v-uni-view",
-            { staticClass: _vm._$g(50, "sc"), attrs: { _i: 50 } },
+            { staticClass: _vm._$g(49, "sc"), attrs: { _i: 49 } },
             [
               _c("v-uni-image", {
-                attrs: { src: _vm._$g(51, "a-src"), _i: 51 },
+                attrs: { src: _vm._$g(50, "a-src"), _i: 50 },
                 on: {
                   click: function($event) {
                     return _vm.$handleViewEvent($event)

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/app-plus/view.css


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/app-plus/view.umd.min.js


BIN
unpackage/res/Apple Distribution_ xuhong yu (72PSN5P7JM)(1).cer


BIN
unpackage/res/zhengyishop.mobileprovision


BIN
unpackage/res/证书.p12


+ 4 - 1
unpackage/res/证书信息.txt

@@ -1,2 +1,5 @@
+安卓
 别名:com.zy.inc
-密码:112233
+密码:112233
+苹果
+密码:123456

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov