修改海报和完成领券对接

src/config/index.js

@@ -6,7 +6,7 @@
 // 修改 BRANCH_ID 为对应的商户id
 // app.js 中brandId 修改为对应
 
-const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
+const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 ,  wx313ec36b710125d4
 //2006 泰华 , wx40fec8944623c8b3
@@ -21,7 +21,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2015 花在花园
 //2016 阿吉豆
 //2017 ACTREE wx2aae34874e88cdf5
-const BRANCH_ID = 1002
+const BRANCH_ID = 3001
 const isMall = true
 
 // const needMock = '' //

src/pages/addAddress/addAddress.js

@@ -2,7 +2,9 @@
 // pages/addAddress/addAddress.js
 const wxService = require('../../utils/wxService')
 const city = require('../../utils/city')
-const { memberId } = wx.getStorageSync('_baseUserInfo')
+const hotwindCity = require('../../utils/hotwindCity')
+const { memberId } = wx.getStorageSync('_baseUserInfo');
+const envInfo = require('../../config/index').envInfo;
 
 wxService.page({
 
@@ -64,7 +66,15 @@ wxService.page({
   },
 
   init() {
-    let cityData = city.default;
+    let cityData = [];
+    //热风地址库特殊处理
+    if (envInfo.brandId == 2010){
+      cityData = hotwindCity.default;
+    }
+    else{
+      cityData = city.default;
+    }
+
     let province = []
     let cityList = []
     let district = []

src/pages/confirmOrder/confirmOrder.js

@@ -2,6 +2,7 @@
 const wxService = require('../../utils/wxService')
 const app = getApp()
 const city = require('../../utils/city')
+const hotwindCity = require('../../utils/hotwindCity')
 const utils = require('../../utils/util')
 const envInfo = require('../../config/index').envInfo;
 
@@ -383,7 +384,15 @@ wxService.page({
     }
   },
   initCitys() {
-    let cityData = city.default;
+    let cityData = [];
+    //热风地址库特殊处理
+    if (envInfo.brandId == 2010) {
+      cityData = hotwindCity.default;
+    }
+    else {
+      cityData = city.default;
+    }
+    
     let province = []
     let cityList = []
     let district = []

src/pages/confirmOrder/confirmOrder.wxss

@@ -8,6 +8,7 @@
 }
 .address-wrap{
   padding: 0 30rpx;
+  margin-top: 20rpx;
 }
 .vip-right {
   width: 100rpx;

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wxac09792264c49b5c",
+	"appid": "wx313ec36b710125d4",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []
@@ -148,7 +148,7 @@
 					"id": 16,
 					"name": "商品详情页",
 					"pathName": "pages/productDetail/productDetail",
-					"query": "id=639868160153096192",
+					"query": "id=634719195157905408",
 					"scene": null
 				},
 				{

src/subPackage/page/pages/shareConfig/shareConfig.wxml

 <!--share/share.wxml-->
-<view hidden="{{isInput}}">
+<view hidden="{{isInput}}" class="canvas-container">
   <canvas class='canvas' canvas-id="myCanvas" style="height:{{height}};"></canvas>
 </view>
 

src/subPackage/page/pages/shareConfig/shareConfig.wxss

@@ -11,17 +11,27 @@ view{
   -webkit-box-sizing: border-box;
 }
 
-.canvas{
-  width: 100%;
+.canvas-container{
+  display: flex;
+  justify-content: center;
+  padding-top: 20rpx;
+}
+
+.canvas-container canvas{
+  box-shadow: 0 0 8rpx 3rpx rgba(0, 0, 0, 0.1);
 }
 
 .btns-containers{
-  width: 100%;
+  /* width: 100%; */
   height: auto;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 30rpx 50rpx;
+  /* padding: 30rpx 80rpx; */
+  width: 562rpx;
+  margin: auto;
+  margin-top: 30rpx;
+  padding-bottom: 30rpx;
 }
 
 .btns-containers .save-btn{
@@ -70,7 +80,9 @@ view{
 
 .statistic-img image{
   display: block;
-  width: 100%;
+  width: 562rpx;
+  height: 1000rpx;
+  box-shadow: 0 0 8rpx 6rpx rgba(0, 0, 0, 0.1);
 }
 
 .input-text{