فهرست منبع

Merge remote-tracking branch 'origin/master'

liyuan 3 هفته پیش
والد
کامیت
c74cc5d73c

+ 1 - 1
common/setting.js

@@ -10,7 +10,7 @@ module.exports = {
 	version: '1.0.0',
 	// 开发环境接口Url
 	// devUrl: 'http://192.168.0.111:1080',
-	// devUrl: 'http://192.168.8.102:1080',
+	// devUrl: 'http://192.168.8.105:1080',
 	// devUrl: 'https://td.echepei.com/api', 
 	devUrl: 'https://lt.echepei.com/api',   // 鑫畅途的
 	// devUrl: 'http://jxy.natapp1.cc/api',

+ 1 - 1
manifest.json

@@ -125,7 +125,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxf37f32ee0d3a10a7",
+        "appid" : "wx18d75b948eaae4b1",
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,

+ 1 - 0
pages/login/login.vue

@@ -161,6 +161,7 @@
 						position: "bottom"
 					})
 				} else {
+					console.log(e.detail.errMsg)
 					uni.showToast({
 						icon: 'none',
 						title: '已拒绝授权',

+ 74 - 64
pages/tabBar/activity/details.vue

@@ -1,77 +1,85 @@
 <template>
 	<view>
+		<!-- <scroll-view scroll-y="true" style="max-height: 81vh;"> -->
 		<view>
-			<image style="width: 100%;height:350rpx;" :src="form.url" mode="scaleToFill"></image>
-		</view>
-		<view class="time-crad">
-			<view class="time-head">
-				<view class="time-title">
-					活动时间
+			<view>
+				<image style="width: 100%;height:350rpx;" :src="form.url" mode="scaleToFill"></image>
+			</view>
+			<view class="card">
+				<view>
+					{{form.activityName}}
 				</view>
-				<view class="time-content">
-					<view class="time-text">
-						开始
-						<view class="time-text2" style="margin-right: 12rpx;">
-							{{form.startDate?form.startDate.slice(0,10):''}}
-						</view>
+				<view style="font-size: 28rpx;color: #959595;">
+					{{form.activityDescription}}
+				</view>
+			</view>
+			<view class="time-crad">
+				<view class="time-head">
+					<view class="time-title">
+						活动时间
 					</view>
-					<image style="width:50rpx;height:8rpx;" src="/static/images/tabBar/1258.png" mode="scaleToFill">
-					</image>
-					<view class="time-text" style="margin-left: 20rpx;">
-						结束
-						<view class="time-text2">
-							{{form.endDate?form.endDate.slice(0,10):''}}
+					<view class="time-content">
+						<view class="time-text">
+							开始
+							<view class="time-text2" style="margin-right: 12rpx;">
+								{{form.startDate?form.startDate.slice(0,10):''}}
+							</view>
+						</view>
+						<image style="width:50rpx;height:8rpx;" src="/static/images/tabBar/1258.png" mode="scaleToFill">
+						</image>
+						<view class="time-text" style="margin-left: 20rpx;">
+							结束
+							<view class="time-text2">
+								{{form.endDate?form.endDate.slice(0,10):''}}
+							</view>
 						</view>
 					</view>
-				</view>
 
-			</view>
-			<view class="time-foot">
-				<view class="time-text">
-					距离活动结束还剩
 				</view>
-				<uni-countdown :font-size="32" :day="days" :hour="hours" :minute="minutes" :second="seconds"
-					color="#FFFFFF" background-color="#E75F37" />
+				<view class="time-foot">
+					<view class="time-text">
+						距离活动结束还剩
+					</view>
+					<uni-countdown :font-size="32" :day="days" :hour="hours" :minute="minutes" :second="seconds"
+						color="#FFFFFF" background-color="#E75F37" />
+				</view>
 			</view>
 		</view>
-<!--		<scroll-view scroll-y="true" style="max-height: 28vh;">
-
-		</scroll-view>-->
-    <view style="padding-bottom: 290rpx;">
-      <view class="card" v-for="(item,index) in form.activityItemsList" :key="index">
-        <view style="margin-left: 20rpx;">
-          <u-checkbox-group v-model="item.select" placement="column" @change="rowSelect($event,item)"
-                            :size='15'>
-            <u-checkbox activeColor="#E75F37" shape="circle" :customStyle="{marginBottom: '8px'}" label="选择"
-                        :name="true" labelSize="28rpx" labelColor='#3B3B3B'></u-checkbox>
-          </u-checkbox-group>
-        </view>
-        <view style="background: #FCF7F5;padding:40rpx 20rpx;border-radius: 10rpx;">
-          <view style="display: flex;align-items: center;">
-            <view style="width: 120rpx;height: 120rpx;">
-              <image :src="item.url"
-                     style="width: 120rpx;height: 120rpx;border-radius: 20rpx;border: 2rpx solid #EEEEEE;">
-              </image>
-            </view>
-            <view style="width: 100%;display: flex;margin-left: 8rpx;">
-              <view>
-                <u--text :text="item.cname" size="24rpx" color='#797979' lines="1"></u--text>
-                <view style="color: #E75F37;font-size: 32rpx;">特价:¥{{item.priceOne}}</view>
-                <view style="color: #797979;font-size: 24rpx;">原价:¥{{item.priceOnePrimary}}</view>
-              </view>
-              <view style="display: flex;justify-content: space-between;margin-top: 20rpx;">
+		<view style="padding-bottom: 290rpx;">
+			<view class="card" v-for="(item,index) in form.activityItemsList" :key="index">
+				<view style="margin-left: 20rpx;">
+					<u-checkbox-group v-model="item.select" placement="column" @change="rowSelect($event,item)"
+						:size='15'>
+						<u-checkbox activeColor="#E75F37" shape="circle" :customStyle="{marginBottom: '8px'}" label="选择"
+							:name="true" labelSize="28rpx" labelColor='#3B3B3B'></u-checkbox>
+					</u-checkbox-group>
+				</view>
+				<view style="background: #FCF7F5;padding:40rpx 20rpx;border-radius: 10rpx;">
+					<view style="display: flex;align-items: center;">
+						<view style="width: 120rpx;height: 120rpx;">
+							<image :src="item.url"
+								style="width: 120rpx;height: 120rpx;border-radius: 20rpx;border: 2rpx solid #EEEEEE;">
+							</image>
+						</view>
+						<view style="width: 100%;display: flex;margin-left: 8rpx;">
+							<view>
+								<u--text :text="item.cname" size="24rpx" color='#797979' lines="1"></u--text>
+								<view style="color: #E75F37;font-size: 32rpx;">特价:¥{{item.priceOne}}</view>
+								<view style="color: #797979;font-size: 24rpx;">原价:¥{{item.priceOnePrimary}}</view>
+							</view>
+							<view style="display: flex;justify-content: space-between;margin-top: 20rpx;">
 
-                <view>
-                  <u-number-box v-model="item.purchaseQuantity" :min="item.minQuantity"
-                                :max="item.maxQuantity" buttonSize="53rpx" color="#414141" bgColor="#FCF7F5"
-                                iconStyle="color:#A4A4A4" @change="rowNumber($event,item)"></u-number-box>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
+								<view>
+									<u-number-box v-model="item.purchaseQuantity" :min="item.minQuantity"
+										:max="item.maxQuantity" buttonSize="53rpx" color="#414141" bgColor="#FCF7F5"
+										iconStyle="color:#A4A4A4" @change="rowNumber($event,item)"></u-number-box>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<view class="submitBar">
 			<view style="margin:20rpx 47rpx;">
 				<view
@@ -94,7 +102,9 @@
 						<view v-if='new Date().getTime()<new Date(form.startDate).getTime()' class="left-btn">
 							活动未开始
 						</view>
-						<view v-else-if='new Date().getTime()>new Date(form.startDate).getTime()&&new Date().getTime()<new Date(form.endDate).getTime()' class="right-btn" @click.stop="immediatePayment('W06')">立即支付
+						<view
+							v-else-if='new Date().getTime()>new Date(form.startDate).getTime()&&new Date().getTime()<new Date(form.endDate).getTime()'
+							class="right-btn" @click.stop="immediatePayment('W06')">立即支付
 						</view>
 						<view v-else class="left-btn">
 							活动已结束
@@ -471,7 +481,7 @@
 		bottom: 0;
 		background-color: #fff;
 		width: 100%;
-    height: 290rpx;
+		height: 290rpx;
 		z-index: 10;
 
 		::v-deep .u-checkbox__icon-wrap {

+ 27 - 0
static/certificate/development/private.wx18d75b948eaae4b1.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA0Tt4pqMZwMMMkE8va47okTx8nLS4TZLDDp/tDPMCQlSolOyl
+swTieuHGpFK7xYKGwr3H8objBmYrYPl6wYWgXod1LxNL6CCD4azZCs800dQv7tf3
+Sdqd/IYWAVDlxIHM5wKEljQoYQun4LA1eEx3HeMdc5GWAPTIYbKDh7hs7/d9vxEG
+smi91o+uBNR1dgrHCgztUWCRNbOSzfnzGK+ZmTt6cLClDMKT1os4ekMCBIJRItP6
+rCnnWocNafNa9QEV5HyYQ+ScG9q+i03Mj7LdDak6An2V5LQ/fv3lL+17gBeKyjWf
+Btc2xGO3oZ1T292FhBzaxZBfv3e0AftVrGfZYQIDAQABAoIBADauvFGQvuJKF7Z/
+e3041D9g95BdCu37NU9VLLb9q9F6HrUNRCENXcOPzkKT/M8Z1e5/ewo/hoXdneiy
+SwrYyZjq/g1XlbcNCGqqqe7RSJSuR/i8KLz8jd25jXa6ldJNuieF2PEIoKT8TtvC
+MbdHBLqi6MeTfQiy8MvXw9hsssvkAdcb91mg4a/OkjMH/aE3wydkRkt3eF51cf2O
+k7KnDy+o6uxGMBYJsVISf+iWhRCbhT8IuJD8D/Vv4S5Ux5quBsB0WT3GZS1aZL8d
+WS9qp5wTQHvu/9zMyrA6RUaTDZgg8fEr1U50x4i5bdHsOZGF+2pzldzWoo/p2UlD
+KPAVh4ECgYEA6SI1W3qXbwypeuMk9x0L62v7JQhLkvUF8GLwVX7QEcXg0JH6X31t
+Ky9aAdCYy67VUhLnvZ3Pue59ylT/3Fs2CQg79XNa/N5y6p4gkXoU64sRE4qzAc5m
+j9x6ra5QdJ4TZOQqqOlyvDzIPsuCSfLxJmy8Cg1ZNFE9Nw3pp55Rbc0CgYEA5cEe
+4+4oqgKw9gHY2uCB9g4diOrGQjMUdUuVBA3vSU86OK3KiJNfV7zHAWhnKxus6KoU
+TO70pe0srO2km+dPZKXNOa458a/12JEyIPJn6YSVkjaDfzmgb7WR13qNx3aLWeFL
+EuWkPVjXR2daW9liyrK3BVL954lOFGcHe8l6JeUCgYBoMHKaLIKLDaScl/EIQ0H1
+d6+o0Dk+NyTtVrpD60W/+6hKbkLv9BUa7LGUCA6RUNRjNrG8y09vsAclqrEiYN0Y
+UkbBnkk2o4/GDN9PRLkev2rlSeJQV1b8yjNFdZbdV1whhdsO3C37tEplzfuvYtSl
+MIklEOwh9oCeHyiiUZ3grQKBgALKYbGrBttpxPR3+UZPS8TNTxaGo3nSXQE/tcOi
+17EwQSjHE5qtD49lP5WIyxf+8g6xYiW9EUOiqdQ/3qv2F0TFrsRwlUuWM4o52T4F
+M7XmYlqwRtCYxpYUwny3hFlT20VwMxU7rM8B8Ttwyewrq8OCgC6UX3kcddJRngmm
+3NDxAoGBAJPc6gpqJViwCCLZtCH1OLEdEUoeEHgLO3WVI2ZYsMzccaxrNTRncRwI
+//F0Zv7SvIX+o+ynCulmE0r+ZXUGJeur8Sx+WN4kmb8y8NoX5reP/5/pF9HZ7Z8Z
+bm54D8Bfj7vxXfFrKEhLkawfr3OtgFEEaPtdI2LU5QZ3mEnaK/Tl
+-----END RSA PRIVATE KEY-----

+ 27 - 0
static/certificate/development/private.wx9a3f9e61d9ede01a.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAqywTrqdYlzsUvQON44UYR0y022OKz8FEVfnIRf+z9ffc3pqD
+e4GUn6vycZy2/RvZ+4AOzEfJpsQygSnNfwo73Neg/NYFLoEIuc8IgXnUxMyzCHvx
+mDR63oQuh8aUU/i/TrTiPHG+G5LxlmWX1tScHYwRXe8zQANNZv2CtGRUzPVYZBvM
+i71kpQbBHK8zLikf8DYrwFMFHwQ3JLbUyV2mRc90UVFx6GekHN47TwfW7s6j+0Gt
+sEWhIl26tlKu/3n3OAmgji+/qjFhP60OC8tHFWIz0DkRlC5wsxQjzsUcOGbDFL4h
+Q+3V1smmf7YcIyp/OWdeakxInPhrCxjh0mcnzwIDAQABAoIBAEtEnHsGVyxY7GuY
+7oGHev+POU/nW5izcWsk5O3y3J1iGps/8mUSu9nicD+JG+X8o0O2McueHYvZZiPp
+z9T3GQ+pOb80FR832jBqW2Ejw22uXWNzrO6y1PyXvyYxKfQqw2TGoVzW3zOcz+LE
+VZo/704G03QsxKp3SUfqXdkY7TkaSM/XViGflt/QshsCiDKBhdfr5kNLip3cFL1c
+ueMmgq0m46XK2OywKs1wfSTRKQEIJLkI0ZM0A/Q2zVBKcIzpX9x17rUmNJVF9UNz
+B2GaFhKa/Pz0XKSeLdL/nLx8x6eQRpTYd50C5BkeMQDeuJYVLf7dRIaDYJgEIJdX
+86fQWIECgYEA4qS8koum+hueP6WqPxPLEPurXF9wSUaXqiqxhf/xRnDx1u6tTkTQ
+ENFFRGnVcOiN+o/VyEDa6/0CWSOywEzdSuz+5mp5uWZoLjzVihFsjcurK+WnY/k8
+IG//zHY9gTnCHvIPblaZsnf7xAOhQFArTpX8ApCh++l07AssIj0WHa8CgYEAwVf3
+94bVHoS4vaAgMmbIzChRDInbfFpGQhhV3le2jT8B9VMFFejWPjJJSyIduD8zzQgF
+YIpRt6YkD1bA1C2Fw9FTAmMPEsuAMPSXI7Zqztm9bjeg/yC4580hqyZ8O8exAWaK
+sxdy74t8HxPPsqbUuhlFsuitzr2rdzj8jUUnP+ECgYEAhtHqHt6WGIefTks1B8q1
+bEfZOtzHBb/Jbn9xFL4Yf4emRO28CCglASwLoVO3lS+xbZBsYnA6ClF6OR5kMcJH
+jU+HnfdOq3wAkyi6+iO9SGgUTcuSFIVpP/5/0tevZJTAJfpmNYOscB6xlHt4S7Kk
+4F2WCMySnzDTzaojucZOxp8CgYA1O38uS5VJ/cjPjNLQjbQjYcZO6XXg2woVEJYz
+zXqZkQt8/AqeaajzHu1HHnGIVP5yKQ8x8WNmaPvsrToSMSZvL6bnNVblGdqFoBIs
+5wCpSxH40qAlHmFKkRQAB2yVGPoHJLBzdrVSdtkJxW6eBYj0ZBjolV+lWFtpS+td
+CfkwgQKBgFbVvbxJzF6LDobqsxAJfjc9sy3hWsyzpLzblMBk1/EovYaF+zLsO+Uy
+Lc5nVhkU7xa3wvSw782dOmwgf+fWBQ++SxhlDt04zH5RcCAOsdBkrgHIpUxXjUKv
+k6N5kO52b3uBZXMIRhR//TlvUYRDZQqJbZez5IOHDDw6u95q/elL
+-----END RSA PRIVATE KEY-----