lianghanqiang 4 gadi atpakaļ
vecāks
revīzija
5cf69291ce

+ 1 - 1
CustomStoryboard/LaunchScreen.storyboard

@@ -17,7 +17,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LILI商城  享你所购" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="9" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aap-f2-ctd">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="南粤商城" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="9" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aap-f2-ctd">
                                 <rect key="frame" x="417.5" y="1291" width="189" height="65"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>

+ 1 - 1
components/verification/verification.vue

@@ -45,7 +45,7 @@
           </view>
 
           <text class="cu-tag bg-cyan round" @click="getCode">刷新拼图</text>
-          <text class="my-neirong-sm cuIcon-safe" style="color: #c1c1c1">Lili-FRAMEWORK</text>
+          <text class="my-neirong-sm cuIcon-safe" style="color: #c1c1c1">nanyue-FRAMEWORK</text>
         </view>
       </view>
     </view>

+ 6 - 4
config/api.js

@@ -6,13 +6,15 @@
 const dev = {
   // common: "https://common-api.pickmall.cn",
   // buyer: "https://buyer-api.pickmall.cn",
-  common: "http://192.168.0.106:8890",
-  buyer: "http://192.168.0.106:8888",
+  common: "http://localhost:8890",
+  buyer: "http://localhost:8888",
 };
 // 生产环境
 const prod = {
-  common: "https://common-api.pickmall.cn",
-  buyer: "https://buyer-api.pickmall.cn",
+  // common: "https://shop-buyer.nanyue6688.com/common-api",
+  // buyer: "https://shop-buyer.nanyue6688.com/buyer-api",
+  common: "http://localhost:8890",
+  buyer: "http://localhost:8888"
 };
 
 //默认生产环境

+ 4 - 4
config/config.js

@@ -1,13 +1,13 @@
-const name = "lilishop";
+const name = "南粤商城";
 export default {
   name: name,
   schemeLink: `${name}://`, //唤起app地址
   downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址,下载app的地址
   shareLink: "https://m-b2b2c.pickmall.cn", //分享地址,也就是在h5中默认的复制地址
-  appid: "wx6f10f29075dc1b0b", //小程序唯一凭证,即 AppID,可在「微信公众平台 - 设置 - 开发设置」页中获得。(需要已经成为开发者,且帐号没有异常状态)
-  appSecret: "6dfbe0c72380dce5d49d65b3c91059b1", //可在 manifest.json 查看
+  appid: "wxd78a776416719686", //小程序唯一凭证,即 AppID,可在「微信公众平台 - 设置 - 开发设置」页中获得。(需要已经成为开发者,且帐号没有异常状态)
+  appSecret: "7f1405c3684b5b077446f0f91640ce3f", //可在 manifest.json 查看
   aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key
   scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
   iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看
-  logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png" //logo地址
+  logo:"https://gxsz-bucket-01.obs.cn-south-1.myhuaweicloud.com/ce174971e4874053822c52edb403c685.png" //logo地址
 }; 

+ 1 - 0
js_sdk/lili-pay/wx-pay.js

@@ -18,6 +18,7 @@ class LiLiWXPay {
       // 调用支付
       initiatePay(paymentMethod, paymentClient, submitData).then((res) => {
         let response = res.data.result;
+		console.log(response,9996665);
         uni.hideLoading();
         uni.requestPayment({
           provider: "wxpay",

+ 6 - 6
manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "lili商城",
+    "name" : "南粤商城",
     "appid" : "__UNI__C100675",
     "description" : "",
     "versionName" : "4.0.23",
@@ -178,7 +178,7 @@
     "mp-weixin" : {
         /* 小程序特有相关 */
         "usingComponents" : true,
-        "appid" : "",
+        "appid" : "wxd78a776416719686",
         "optimization" : {
             "subPackages" : true
         },
@@ -197,13 +197,13 @@
             "myPlugin" : {
                 "version" : "1.1.0",
                 "provider" : "wx738958e0f4c894f9"
-            },
-            "live-player-plugin" : {
-                "version" : "1.3.0",
-                "provider" : "wx2b03c6e691cd7370"
             }
         }
     },
+    // "live-player-plugin" : {
+    //     "version" : "1.3.0",
+    //     "provider" : "wx2b03c6e691cd7370"
+    // }
     "h5" : {
         "devServer" : {
             "disableHostCheck" : true

+ 1 - 40
package-lock.json

@@ -1,42 +1,3 @@
 {
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "async-validator": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.12.2.tgz",
-      "integrity": "sha512-57EETfCPFiB7M4QscvQzWSGNsmtkjjzZv318SK1CBlstk+hycV72ocjriMOOM48HjvmoAoJGpJNjC7Z76RlnZA=="
-    },
-    "core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-    },
-    "deepmerge": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
-    },
-    "popper.js": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-0.6.4.tgz",
-      "integrity": "sha1-GDfEdgr1TSuyC2b5wJuSmT2Exik="
-    },
-    "uview": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/uview/-/uview-0.1.0.tgz",
-      "integrity": "sha1-tASc8q1kE1430huAdCtjeoLl7yo=",
-      "requires": {
-        "async-validator": "^1.7.1",
-        "core-js": "^2.4.1",
-        "deepmerge": "^1.5.0",
-        "popper.js": "^0.6.4"
-      }
-    },
-    "xmldom": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
-      "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
-    }
-  }
+  "lockfileVersion": 1
 }

+ 1 - 1
pages.json

@@ -703,7 +703,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "Lili商城",
+		"navigationBarTitleText": "南粤商城",
 		"titleColor": "#303133",
 		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#fff",

+ 4 - 4
pages/mine/set/editionIntro.vue

@@ -1,7 +1,7 @@
 
 <template>
   <view class="edition-intro">
-    <image src="https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png" class="logo" />
+    <image src="https://gxsz-bucket-01.obs.cn-south-1.myhuaweicloud.com/ce174971e4874053822c52edb403c685.png" class="logo" />
     <h1> {{config.name}}</h1>
     <view class='version'>
       <!-- #ifdef APP-PLUS -->
@@ -24,11 +24,11 @@
     </u-cell-group>
 
     <view class="intro">
-      <view>客服热线:13161366885</view>
-      <view style="margin:20rpx 0 0 0;">客服邮箱:lili@lili.com</view>
+      <view>客服热线:020-34152794</view>
+      <view style="margin:20rpx 0 0 0;">客服邮箱:defu@nanyue6688.com</view>
 
       <view>
-        <view style="margin:20rpx 0; color:#003a8c;" @click="navigateTo('/pages/mine/help/tips?type=user')">《lili商城用户协议》</view>
+        <view style="margin:20rpx 0; color:#003a8c;" @click="navigateTo('/pages/mine/help/tips?type=user')">《南粤商城用户协议》</view>
         <view>CopyRight @{{config.name}} </view>
       </view>
     </view>

+ 1 - 1
pages/passport/login.vue

@@ -6,7 +6,7 @@
     <view class="logo-cell">
       <image class="logo" src="/static/logo.png" mode="aspectFit"></image>
     </view>
-    <view class="title">LiLi商城</view>
+    <view class="title">南粤商城</view>
 
     <!-- 验证码登录 -->
     <codeLogin @open="open" :status="value" v-if="login && loginData.code" />

+ 1 - 1
pages/passport/wechatMPLogin.vue

@@ -38,7 +38,7 @@ export default {
       // 是否展示手机号码授权弹窗,默认第一步不展示,要先获取用户基础信息
       phoneAuthPopup: false,
       // 授权信息展示,商城名称
-      projectName: "LiLi",
+      projectName: "南粤",
       //微信返回信息,用于揭秘信息,获取sessionkey
       code: "",
       //微信昵称

+ 1 - 1
pages/promotion/lives.vue

@@ -29,7 +29,7 @@
             {{item.name}}
           </div>
           <div class="live-store">
-            <span class="wes">lilishop</span>
+            <span class="wes">南粤商城</span>
           </div>
           <div class="live-goods-list">
             <div class="live-goods-item">

+ 6 - 0
pages/tabbar/home/template/tpl.js

@@ -91,6 +91,12 @@ export function modelNavigateTo(item) {
             url: `/pages/navigation/point/point-mall`,
           });
           break;
+		case "音乐之声":
+			let address = encodeURIComponent('https://music.nanyue6688.com/vote-h5/#/pages/index/guide') ;
+			uni.navigateTo({
+			  url: `/pages/tabbar/home/web-view?src=${address}`,
+			});
+		break;
       }
 
       break;